kamd-rename.patch 3.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192
  1. diff --git a/autotests/Process.cpp b/autotests/Process.cpp
  2. index a7a0507..afa4bf1 100644
  3. --- a/autotests/Process.cpp
  4. +++ b/autotests/Process.cpp
  5. @@ -83,7 +83,7 @@ void Modifier::initTestCase()
  6. // qDebug() << env;
  7. s_process->setEnvironment(env);
  8. - s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd"));
  9. + s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5"));
  10. s_process->waitForStarted();
  11. diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp
  12. index 077c634..7be66dd 100644
  13. --- a/src/lib/core/manager_p.cpp
  14. +++ b/src/lib/core/manager_p.cpp
  15. @@ -94,11 +94,11 @@ Manager *Manager::self()
  16. ->property("org.kde.KActivities.core.disableAutostart")
  17. .toBool()) {
  18. qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon";
  19. - QProcess::startDetached(QStringLiteral("kactivitymanagerd"));
  20. + QProcess::startDetached(QStringLiteral("kactivitymanagerd5"));
  21. }
  22. #else
  23. - QProcess::startDetached(QStringLiteral("kactivitymanagerd"));
  24. + QProcess::startDetached(QStringLiteral("kactivitymanagerd5"));
  25. #endif
  26. }
  27. diff --git a/src/service/Application.cpp b/src/service/Application.cpp
  28. index 6b0e3e1..3894540 100644
  29. --- a/src/service/Application.cpp
  30. +++ b/src/service/Application.cpp
  31. @@ -280,7 +280,7 @@ int main(int argc, char **argv)
  32. application.setApplicationName(QStringLiteral("ActivityManager"));
  33. application.setOrganizationDomain(QStringLiteral("kde.org"));
  34. - // KAboutData about("kactivitymanagerd", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0",
  35. + // KAboutData about("kactivitymanagerd5", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0",
  36. // ki18n("KDE Activity Management Service"),
  37. // KAboutData::License_GPL,
  38. // ki18n("(c) 2010, 2011, 2012 Ivan Cukic"), KLocalizedString(),
  39. @@ -333,7 +333,7 @@ int main(int argc, char **argv)
  40. // Starting the dameon
  41. QProcess::startDetached(
  42. - KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd",
  43. + KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5",
  44. QStringList{"start-daemon"}
  45. );
  46. diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
  47. index 4b4978b..2220f34 100644
  48. --- a/src/service/CMakeLists.txt
  49. +++ b/src/service/CMakeLists.txt
  50. @@ -62,9 +62,9 @@ qt5_add_dbus_adaptor (
  51. Features.h Features
  52. )
  53. -add_executable (kactivitymanagerd ${kactivitymanager_SRCS})
  54. +add_executable (kactivitymanagerd5 ${kactivitymanager_SRCS})
  55. -target_link_libraries (kactivitymanagerd
  56. +target_link_libraries (kactivitymanagerd5
  57. Qt5::Core
  58. Qt5::DBus
  59. Qt5::Widgets
  60. @@ -84,7 +84,7 @@ install (FILES
  61. )
  62. install (TARGETS
  63. - kactivitymanagerd ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
  64. + kactivitymanagerd5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
  65. )
  66. install (FILES
  67. diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop
  68. index be5faa1..3c9b9a9 100644
  69. --- a/src/service/files/kactivitymanagerd.desktop
  70. +++ b/src/service/files/kactivitymanagerd.desktop
  71. @@ -4,7 +4,7 @@ Icon=preferences-activities
  72. X-KDE-ServiceTypes=
  73. X-DBUS-StartupType=Unique
  74. X-KDE-StartupNotify=false
  75. -Exec=kactivitymanagerd
  76. +Exec=kactivitymanagerd5
  77. Name=Activity Manager
  78. Name[ar]=مدير الأنشطة