Merge pull request #29117 from bkchr/kde_applications_17_08_1

kdeApplications: 17.08.0 -> 17.08.1
This commit is contained in:
Thomas Tuegel 2017-09-11 05:09:23 -05:00 committed by GitHub
commit 6299659da6
4 changed files with 1377 additions and 1391 deletions

View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/17.08.0/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/applications/17.08.1/ -A '*.tar.xz' )

View File

@ -12,5 +12,4 @@ mkDerivation {
grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml
ki18n kinit kservice xapian
];
patches = [ ./khelpcenter_kcoreaddons.patch ];
}

View File

@ -1,13 +0,0 @@
diff --git a/searchhandlers/CMakeLists.txt b/searchhandlers/CMakeLists.txt
index 298a32e..b9e06c6 100644
--- a/searchhandlers/CMakeLists.txt
+++ b/searchhandlers/CMakeLists.txt
@@ -16,7 +16,7 @@ set(khc_xapianindexer_SOURCES
add_executable(khc_xapianindexer ${khc_xapianindexer_SOURCES})
kde_target_enable_exceptions(khc_xapianindexer PRIVATE)
ecm_mark_nongui_executable(khc_xapianindexer)
-target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES})
+target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive KF5::CoreAddons ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES})
if (${KF5_VERSION} VERSION_GREATER 5.35.0)
# practically means >=5.36
target_link_libraries(khc_xapianindexer KF5::DocTools)

File diff suppressed because it is too large Load Diff