commit: 287a7e5af4faf529d1757f4cd76f5798652435a6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 18 21:02:05 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 18 21:02:28 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=287a7e5a
kde-apps/kate: Drop obsolete DEPEND Upstream commit 4a157701ad3fae7fed67a92a9d9359dd36f08341 Package-Manager: Portage-2.3.19, Repoman-2.3.6 kde-apps/kate/files/kate-17.12.1-deps.patch | 79 +++++++++++++++++++++++++++++ kde-apps/kate/kate-17.12.49.9999.ebuild | 2 + kde-apps/kate/kate-9999.ebuild | 1 - 3 files changed, 81 insertions(+), 1 deletion(-) diff --git a/kde-apps/kate/files/kate-17.12.1-deps.patch b/kde-apps/kate/files/kate-17.12.1-deps.patch new file mode 100644 index 0000000000..05f3d53ff1 --- /dev/null +++ b/kde-apps/kate/files/kate-17.12.1-deps.patch @@ -0,0 +1,79 @@ +From 4a157701ad3fae7fed67a92a9d9359dd36f08341 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?K=C3=A5re=20S=C3=A4rs?= <kare.s...@iki.fi> +Date: Tue, 12 Dec 2017 07:24:53 +0200 +Subject: Remove obsolete QScript includes from CMake files + +Differential Revision: https://phabricator.kde.org/D9291 +--- + CMakeLists.txt | 2 +- + addons/katesql/CMakeLists.txt | 2 +- + addons/project/CMakeLists.txt | 2 +- + addons/search/CMakeLists.txt | 2 +- + addons/snippets/CMakeLists.txt | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1fc7d3e..b746376 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,7 @@ include (CheckFunctionExists) + include(KDEInstallDirs) + include(KDECMakeSettings) + +-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Sql) ++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Sql) + + if(BUILD_TESTING) + find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) +diff --git a/addons/katesql/CMakeLists.txt b/addons/katesql/CMakeLists.txt +index aba9a38..c4fee13 100644 +--- a/addons/katesql/CMakeLists.txt ++++ b/addons/katesql/CMakeLists.txt +@@ -32,6 +32,6 @@ kcoreaddons_desktop_to_json (katesqlplugin katesql.desktop) + target_link_libraries(katesqlplugin + KF5::TextEditor + KF5::Parts KF5::I18n KF5::Wallet +- Qt5::Script Qt5::Sql KF5::ItemViews KF5::IconThemes) ++ Qt5::Sql KF5::ItemViews KF5::IconThemes) + + install(TARGETS katesqlplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor ) +diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt +index 6787197..12a0ff7 100644 +--- a/addons/project/CMakeLists.txt ++++ b/addons/project/CMakeLists.txt +@@ -38,7 +38,7 @@ target_link_libraries(kateprojectplugin + KF5::TextEditor + KF5::Parts KF5::I18n + KF5::GuiAddons +- Qt5::Script KF5::ItemViews KF5::ItemModels KF5::IconThemes KF5::ThreadWeaver ++ KF5::ItemViews KF5::ItemModels KF5::IconThemes KF5::ThreadWeaver + KF5::NewStuff # For KMoreTools + ) + +diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt +index d86c326..856221f 100644 +--- a/addons/search/CMakeLists.txt ++++ b/addons/search/CMakeLists.txt +@@ -19,6 +19,6 @@ kcoreaddons_desktop_to_json (katesearchplugin katesearch.desktop) + target_link_libraries(katesearchplugin + KF5::TextEditor + KF5::Parts KF5::I18n KF5::IconThemes +- Qt5::Script KF5::ItemViews) ++ KF5::ItemViews) + + install(TARGETS katesearchplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor) +diff --git a/addons/snippets/CMakeLists.txt b/addons/snippets/CMakeLists.txt +index a19277e..4182866 100644 +--- a/addons/snippets/CMakeLists.txt ++++ b/addons/snippets/CMakeLists.txt +@@ -29,6 +29,6 @@ kcoreaddons_desktop_to_json (katesnippetsplugin katesnippetsplugin.desktop) + target_link_libraries(katesnippetsplugin + KF5::TextEditor + KF5::Parts KF5::I18n +- KF5::NewStuff Qt5::Script KF5::ItemViews KF5::IconThemes) ++ KF5::NewStuff KF5::ItemViews KF5::IconThemes) + + install(TARGETS katesnippetsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor ) +-- +cgit v0.11.2 + diff --git a/kde-apps/kate/kate-17.12.49.9999.ebuild b/kde-apps/kate/kate-17.12.49.9999.ebuild index ae0924c282..861377cb79 100644 --- a/kde-apps/kate/kate-17.12.49.9999.ebuild +++ b/kde-apps/kate/kate-17.12.49.9999.ebuild @@ -54,6 +54,8 @@ RDEPEND="${DEPEND} !kde-misc/ktexteditorpreviewplugin " +PATCHES=( "${FILESDIR}/${PN}-17.12.1-deps.patch" ) + src_prepare() { kde5_src_prepare # test hangs diff --git a/kde-apps/kate/kate-9999.ebuild b/kde-apps/kate/kate-9999.ebuild index ae0924c282..7760f20e57 100644 --- a/kde-apps/kate/kate-9999.ebuild +++ b/kde-apps/kate/kate-9999.ebuild @@ -38,7 +38,6 @@ DEPEND=" $(add_frameworks_dep kxmlgui) $(add_qt_dep qtdbus) $(add_qt_dep qtgui) - $(add_qt_dep qtscript) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) addons? (
