File rename_fontinst_helper.patch of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File rename_fontinst_helper.patch of Package plasma5-workspace (Revision 1793249a3624763f9fef2dc9c9d4ba11)

Currently displaying revision 1793249a3624763f9fef2dc9c9d4ba11 , Show latest

diff -Nur plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/CMakeLists.txt plasma-workspace-5.19.90/kcms/kfontinst/dbus/CMakeLists.txt
--- plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/CMakeLists.txt
+++ plasma-workspace-5.19.90/kcms/kfontinst/dbus/CMakeLists.txt
@@ -23,8 +23,8 @@
 install(TARGETS fontinst_helper DESTINATION ${KAUTH_HELPER_INSTALL_DIR} )
 install(PROGRAMS fontinst_x11 DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
 
-configure_file(org.kde.fontinst.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/session/org.kde.fontinst.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session/org.kde.fontinst.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR} )
+configure_file(org.kde.fontinst.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/session/org.kde.fontinst5.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session/org.kde.fontinst5.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR} )
 
-kauth_install_helper_files(fontinst_helper org.kde.fontinst root)
-kauth_install_actions(org.kde.fontinst fontinst.actions)
+kauth_install_helper_files(fontinst_helper org.kde.fontinst5 root)
+kauth_install_actions(org.kde.fontinst5 fontinst.actions)
diff -Nur plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/fontinst.actions plasma-workspace-5.19.90/kcms/kfontinst/dbus/fontinst.actions
--- plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/fontinst.actions
+++ plasma-workspace-5.19.90/kcms/kfontinst/dbus/fontinst.actions
@@ -22,7 +22,7 @@
 Name[vi]=Trình cài đặt phông chữ
 Name[x-test]=xxFont Installerxx
 Icon=preferences-desktop-font-installer
-[org.kde.fontinst.manage]
+[org.kde.fontinst5.manage]
 Name=Manage system-wide fonts.
 Name[az]=Sistem şriftlərinin idarəsi.
 Name[ca]=Gestiona els tipus de lletra del sistema.
diff -Nur plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/FontInst.cpp plasma-workspace-5.19.90/kcms/kfontinst/dbus/FontInst.cpp
--- plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/FontInst.cpp
+++ plasma-workspace-5.19.90/kcms/kfontinst/dbus/FontInst.cpp
@@ -104,7 +104,7 @@
     isSystem=Misc::root();
     registerTypes();
 
-    new FontinstAdaptor(this);
+    new Fontinst5Adaptor(this);
     QDBusConnection bus=QDBusConnection::sessionBus();
 
     KFI_DBUG << "Connecting to session bus";
@@ -943,9 +943,9 @@
 
 int FontInst::performAction(const QVariantMap &args)
 {
-    KAuth::Action action("org.kde.fontinst.manage");
+    KAuth::Action action("org.kde.fontinst5.manage");
 
-    action.setHelperId("org.kde.fontinst");
+    action.setHelperId("org.kde.fontinst5");
     action.setArguments(args);
     KFI_DBUG << "Call " << args["method"].toString() << " on helper";
     itsFontListTimer->stop();
diff -Nur plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/FontInst.h plasma-workspace-5.19.90/kcms/kfontinst/dbus/FontInst.h
--- plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/FontInst.h
+++ plasma-workspace-5.19.90/kcms/kfontinst/dbus/FontInst.h
@@ -44,7 +44,7 @@
 class KFONTINST_EXPORT FontInst : public QObject
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.kde.fontinst")
+    Q_CLASSINFO("D-Bus Interface", "org.kde.fontinst5")
 
     public:
 
diff -Nur plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/FontinstIface.h plasma-workspace-5.19.90/kcms/kfontinst/dbus/FontinstIface.h
--- plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/FontinstIface.h
+++ plasma-workspace-5.19.90/kcms/kfontinst/dbus/FontinstIface.h
@@ -33,7 +33,7 @@
     Q_OBJECT
 public:
     static inline const char *staticInterfaceName()
-    { return "org.kde.fontinst"; }
+    { return "org.kde.fontinst5"; }
 
 public:
     OrgKdeFontinstInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
diff -Nur plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/Helper.cpp plasma-workspace-5.19.90/kcms/kfontinst/dbus/Helper.cpp
--- plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/Helper.cpp
+++ plasma-workspace-5.19.90/kcms/kfontinst/dbus/Helper.cpp
@@ -38,7 +38,7 @@
 
 #define KFI_DBUG qDebug() << time(nullptr)
 
-KAUTH_HELPER_MAIN("org.kde.fontinst", KFI::Helper)
+KAUTH_HELPER_MAIN("org.kde.fontinst5", KFI::Helper)
 
 namespace KFI
 {
diff -Nur plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake plasma-workspace-5.19.90/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
--- plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
+++ plasma-workspace-5.19.90/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
@@ -1,4 +1,4 @@
 [D-BUS Service]
-Name=org.kde.fontinst
+Name=org.kde.fontinst5
 Exec=@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@/fontinst
 
diff -Nur plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake plasma-workspace-5.19.90/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake
--- plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake
+++ plasma-workspace-5.19.90/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake
@@ -1,5 +1,5 @@
 [D-BUS Service]
-Name=org.kde.fontinst
+Name=org.kde.fontinst5
 Exec=@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@/fontinst
 User=root
 
diff -Nur plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/org.kde.fontinst.xml plasma-workspace-5.19.90/kcms/kfontinst/dbus/org.kde.fontinst.xml
--- plasma-workspace-5.19.90.old/kcms/kfontinst/dbus/org.kde.fontinst.xml
+++ plasma-workspace-5.19.90/kcms/kfontinst/dbus/org.kde.fontinst.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.kde.fontinst">
+  <interface name="org.kde.fontinst5">
     <signal name="fontList">
       <arg name="pid" type="i" direction="out"/>
       <arg name="families" type="a(ba(sa(utba(ssi))))" direction="out"/>
diff -Nur plasma-workspace-5.19.90.old/kcms/kfontinst/lib/KfiConstants.h plasma-workspace-5.19.90/kcms/kfontinst/lib/KfiConstants.h
--- plasma-workspace-5.19.90.old/kcms/kfontinst/lib/KfiConstants.h
+++ plasma-workspace-5.19.90/kcms/kfontinst/lib/KfiConstants.h
@@ -44,7 +44,7 @@
 #define KFI_KIO_TIMEOUT              "timeout"
 #define KFI_KIO_FACE                 "face"
 
-#define KFI_IFACE                    "org.kde.fontinst"
+#define KFI_IFACE                    "org.kde.fontinst5"
 
 #define KFI_FILE_QUERY               "file"
 #define KFI_NAME_QUERY               "name"

Places

File rename_fontinst_helper.patch of Package plasma5-workspace (Revision 1793249a3624763f9fef2dc9c9d4ba11)

Places