kde-applications: 17.04.3 -> 17.08.0

This commit is contained in:
Jos van den Oever 2017-08-18 19:28:05 +02:00
parent e20afe8d2e
commit df3e7beede
5 changed files with 1188 additions and 1170 deletions

View File

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

View File

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

View File

@ -0,0 +1,13 @@
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)

View File

@ -1,7 +1,9 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools, shared_mime_info,
kconfig, kinit, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, qtscript
extra-cmake-modules, kdoctools,
qtscript, kconfig, kinit, karchive, kcrash,
kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
shared_mime_info
}:
mkDerivation {
@ -10,8 +12,10 @@ mkDerivation {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
buildInputs = [
kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 qtscript
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
buildInputs = [ shared_mime_info ];
propagatedBuildInputs = [
kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
karchive kcrash
];
}

File diff suppressed because it is too large Load Diff