commit: 287aa61851bacdaed8ee03f70b5d8952261f4b68 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Nov 15 00:44:54 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Nov 15 00:44:54 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=287aa618
dev-util/kdevelop-css: Drop obsolete patch, someone else upstreamed it Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kdevelop-css/files/kdevelop-css-tests.patch | 50 ---------------------- dev-util/kdevelop-css/kdevelop-css-9999.ebuild | 10 ++--- 2 files changed, 4 insertions(+), 56 deletions(-) diff --git a/dev-util/kdevelop-css/files/kdevelop-css-tests.patch b/dev-util/kdevelop-css/files/kdevelop-css-tests.patch deleted file mode 100644 index 79654840d5..0000000000 --- a/dev-util/kdevelop-css/files/kdevelop-css-tests.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7a32e32d55f6e765798098790beda88b0dc5eb7a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Sun, 22 Oct 2017 13:12:10 +0200 -Subject: [PATCH] Make tests conditional on BUILD_TESTING - -They depend on kdevelop being built with tests. ---- - CMakeLists.txt | 2 ++ - parser/CMakeLists.txt | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4d25a98..c310b9e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -88,6 +88,7 @@ target_link_libraries(kdevcsssupport - # kdebugsettings file - install(FILES kdevcsssupport.categories DESTINATION ${KDE_INSTALL_CONFDIR}) - -+if(BUILD_TESTING) - ### next target - set(completionmodeltest_SRCS - completion/test/modeltest.cpp -@@ -139,5 +140,6 @@ ecm_add_test(${parsejobtest_SRCS} - KDev::Interfaces KDev::Language KDev::Tests - KF5::I18n KF5::TextEditor - ) -+endif() - - feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) -diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt -index e9014f8..91afa21 100644 ---- a/parser/CMakeLists.txt -+++ b/parser/CMakeLists.txt -@@ -47,6 +47,7 @@ target_link_libraries( kdev4cssparser LINK_PRIVATE - ) - install(TARGETS kdev4cssparser DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS}) - -+if(BUILD_TESTING) - ### next target - add_executable(css-parser ${CMAKE_CURRENT_BINARY_DIR}/tokenizer.cpp main.cpp) - target_link_libraries(css-parser -@@ -71,3 +72,4 @@ ecm_add_test(${parsertest_SRCS} - KDev::Language - KDev::Tests - ) -+endif() --- -2.14.2 - diff --git a/dev-util/kdevelop-css/kdevelop-css-9999.ebuild b/dev-util/kdevelop-css/kdevelop-css-9999.ebuild index 840e5d4c02..f43e4c2275 100644 --- a/dev-util/kdevelop-css/kdevelop-css-9999.ebuild +++ b/dev-util/kdevelop-css/kdevelop-css-9999.ebuild @@ -18,10 +18,6 @@ SLOT="5" KEYWORDS="" IUSE="" -BDEPEND=" - sys-devel/flex - test? ( >=dev-util/kdevelop-5.1.80:5[test] ) -" DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 @@ -34,5 +30,7 @@ DEPEND=" >=kde-frameworks/threadweaver-${KFMIN}:5 " RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-tests.patch" ) # TODO: upstream +BDEPEND=" + sys-devel/flex + test? ( >=dev-util/kdevelop-5.1.80:5[test] ) +"
