marble/trunk/no-knewstuff.patch

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