Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:wolfi323:branches:KDE:Frameworks5
plasma5-workspace
rename_fontinst_helper.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File rename_fontinst_helper.patch of Package plasma5-workspace
diff -Nur plasma-workspace-5.20.0.old/kcms/kfontinst/dbus/CMakeLists.txt plasma-workspace-5.20.0/kcms/kfontinst/dbus/CMakeLists.txt --- plasma-workspace-5.20.0.old/kcms/kfontinst/dbus/CMakeLists.txt +++ plasma-workspace-5.20.0/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.25.90.old/kcms/kfontinst/dbus/fontinst.actions plasma-workspace-5.25.90/kcms/kfontinst/dbus/fontinst.actions --- plasma-workspace-5.25.90.old/kcms/kfontinst/dbus/fontinst.actions +++ plasma-workspace-5.25.90/kcms/kfontinst/dbus/fontinst.actions @@ -26,7 +26,7 @@ Name[zh_CN]=字体安装程序 Name[zh_TW]=字型安裝器 Icon=preferences-desktop-font-installer -[org.kde.fontinst.manage] +[org.kde.fontinst5.manage] Name=Manage system-wide fonts. Name[ar]=أدر الخطوط في النظام بأكمله Name[az]=Sistem şriftlərinin idarəsi. diff -Nur plasma-workspace-5.23.90.old/kcms/kfontinst/dbus/FontInst.cpp plasma-workspace-5.23.90/kcms/kfontinst/dbus/FontInst.cpp --- plasma-workspace-5.23.90.old/kcms/kfontinst/dbus/FontInst.cpp +++ plasma-workspace-5.23.90/kcms/kfontinst/dbus/FontInst.cpp @@ -81,7 +81,7 @@ isSystem = Misc::root(); registerTypes(); - new FontinstAdaptor(this); + new Fontinst5Adaptor(this); QDBusConnection bus = QDBusConnection::sessionBus(); // qDebug() << "Connecting to session bus"; @@ -855,9 +855,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); // qDebug() << "Call " << args["method"].toString() << " on helper"; m_fontListTimer->stop(); diff -Nur plasma-workspace-5.20.0.old/kcms/kfontinst/dbus/FontInst.h plasma-workspace-5.20.0/kcms/kfontinst/dbus/FontInst.h --- plasma-workspace-5.20.0.old/kcms/kfontinst/dbus/FontInst.h +++ plasma-workspace-5.20.0/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: enum EStatus { diff -Nur plasma-workspace-5.20.90.old/kcms/kfontinst/dbus/FontinstIface.h plasma-workspace-5.20.90/kcms/kfontinst/dbus/FontinstIface.h --- plasma-workspace-5.20.90.old/kcms/kfontinst/dbus/FontinstIface.h +++ plasma-workspace-5.20.90/kcms/kfontinst/dbus/FontinstIface.h @@ -34,7 +3,7 @@ public: static inline const char *staticInterfaceName() { - return "org.kde.fontinst"; + return "org.kde.fontinst5"; } public: diff -Nur plasma-workspace-5.20.0.old/kcms/kfontinst/dbus/Helper.cpp plasma-workspace-5.20.0/kcms/kfontinst/dbus/Helper.cpp --- plasma-workspace-5.20.0.old/kcms/kfontinst/dbus/Helper.cpp +++ plasma-workspace-5.20.0/kcms/kfontinst/dbus/Helper.cpp @@ -20,7 +20,7 @@ #include <sys/types.h> #include <unistd.h> -KAUTH_HELPER_MAIN("org.kde.fontinst", KFI::Helper) +KAUTH_HELPER_MAIN("org.kde.fontinst5", KFI::Helper) namespace KFI { diff -Nur plasma-workspace-5.20.0.old/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake plasma-workspace-5.20.0/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake --- plasma-workspace-5.20.0.old/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake +++ plasma-workspace-5.20.0/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.20.0.old/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake plasma-workspace-5.20.0/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake --- plasma-workspace-5.20.0.old/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake +++ plasma-workspace-5.20.0/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.20.0.old/kcms/kfontinst/dbus/org.kde.fontinst.xml plasma-workspace-5.20.0/kcms/kfontinst/dbus/org.kde.fontinst.xml --- plasma-workspace-5.20.0.old/kcms/kfontinst/dbus/org.kde.fontinst.xml +++ plasma-workspace-5.20.0/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.20.90.old/kcms/kfontinst/lib/KfiConstants.h plasma-workspace-5.20.90/kcms/kfontinst/lib/KfiConstants.h --- plasma-workspace-5.20.90.old/kcms/kfontinst/lib/KfiConstants.h +++ plasma-workspace-5.20.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"
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor