no-knewstuff.patch 1.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253
  1. diff --git a/src/apps/marble-kde/CMakeLists.txt b/src/apps/marble-kde/CMakeLists.txt
  2. index 8548aac73..e764163ee 100644
  3. --- a/src/apps/marble-kde/CMakeLists.txt
  4. +++ b/src/apps/marble-kde/CMakeLists.txt
  5. @@ -2,7 +2,7 @@ if(NOT ECM_FOUND)
  6. return()
  7. endif()
  8. -macro_optional_find_package(KF5 ${REQUIRED_KF5_MIN_VERSION} QUIET COMPONENTS Crash NewStuff Parts CoreAddons I18n)
  9. +macro_optional_find_package(KF5 ${REQUIRED_KF5_MIN_VERSION} QUIET COMPONENTS Crash Parts CoreAddons I18n)
  10. if(NOT KF5_FOUND)
  11. return()
  12. @@ -22,7 +22,6 @@ set_target_properties(marble_part PROPERTIES PREFIX "${CMAKE_SHARED_LIBRARY_PREF
  13. target_link_libraries(marble_part
  14. marbleui
  15. marblewidget
  16. - KF5::NewStuff
  17. KF5::Parts
  18. KF5::CoreAddons
  19. KF5::I18n
  20. @@ -31,11 +30,6 @@ target_link_libraries(marble_part
  21. install(TARGETS marble_part DESTINATION ${KDE_INSTALL_PLUGINDIR})
  22. install(FILES marble_part.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
  23. install(FILES marble_part.rc marbleui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/marble)
  24. -if(KF5NewStuff_VERSION VERSION_GREATER "5.56.0")
  25. - install(FILES marble.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
  26. -else()
  27. - install(FILES marble.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
  28. -endif()
  29. ki18n_wrap_ui(marble_kde_SRCS ${marble_UI})
  30. kconfig_add_kcfg_files(marble_kde_SRCS settings.kcfgc)
  31. @@ -55,7 +49,6 @@ target_link_libraries (
  32. marbleui
  33. marblewidget
  34. astro
  35. - KF5::NewStuff
  36. KF5::Parts
  37. KF5::Crash
  38. KF5::CoreAddons
  39. diff --git a/src/apps/marble-kde/marble.knsrc b/src/apps/marble-kde/marble.knsrc
  40. deleted file mode 100644
  41. index b695f4521..000000000
  42. --- a/src/apps/marble-kde/marble.knsrc
  43. +++ /dev/null
  44. @@ -1,5 +0,0 @@
  45. -[KNewStuff3]
  46. -ProvidersUrl=http://edu.kde.org/marble/newstuff/providers-4.5.xml
  47. -Categories=Marble Map
  48. -XdgTargetDir=marble/maps
  49. -Uncompress=archive