diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-10 01:44:12 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-10 07:32:24 +0200 |
| commit | 29cb544ad154b8a2f9e3354dd141abc60f45060a (patch) | |
| tree | c57a3776e3c9166ef633cb6fd9faa1ed93250032 /dev-util/kdevelop-php/files | |
| parent | www-client/opera-developer: Old. (diff) | |
| download | gentoo-29cb544ad154b8a2f9e3354dd141abc60f45060a.tar.gz gentoo-29cb544ad154b8a2f9e3354dd141abc60f45060a.tar.bz2 gentoo-29cb544ad154b8a2f9e3354dd141abc60f45060a.zip | |
dev-util/kdevelop-php: Fix test DEPENDs, disable hanging tests
This time for real.
Closes: https://bugs.gentoo.org/667922
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'dev-util/kdevelop-php/files')
| -rw-r--r-- | dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch | 52 |
1 files changed, 50 insertions, 2 deletions
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch index 3e376161d381..853952f11ac5 100644 --- a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch +++ b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch @@ -1,8 +1,15 @@ -From 5cee4d7ea10de55af2d421f5f596eb9f09830740 Mon Sep 17 00:00:00 2001 +From eb3a484c072f7cc5a319d919d54e6d843cd8c79f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> Date: Sun, 7 Oct 2018 12:05:45 +0200 -Subject: [PATCH] Make Qt5Test optional +Subject: [PATCH 1/2] Make Qt5Test optional +Test Plan: Builds fine w/o Qt5Test present. + +Subscribers: kdevelop-devel + +Tags: #kdevelop + +Differential Revision: https://phabricator.kde.org/D16012 --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) @@ -26,3 +33,44 @@ index c09ca29..c1e25d6 100644 -- 2.19.1 + +From 600c167d742da9f22f6d72f6b5d8c3919de2580b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Wed, 10 Oct 2018 01:35:19 +0200 +Subject: [PATCH 2/2] Drop unused KF5Archive + +--- + CMakeLists.txt | 2 +- + completion/tests/CMakeLists.txt | 4 ---- + 2 files changed, 1 insertion(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c1e25d6..5f1070a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,7 +26,7 @@ if(BUILD_TESTING) + find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) + endif() + set(KF5_DEP_VERSION "5.15.0") +-find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils) ++find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS ThreadWeaver TextEditor I18n ItemModels KCMUtils) + find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED) + find_package(KDevelop-PG-Qt REQUIRED) + +diff --git a/completion/tests/CMakeLists.txt b/completion/tests/CMakeLists.txt +index dbe37c1..214cc05 100644 +--- a/completion/tests/CMakeLists.txt ++++ b/completion/tests/CMakeLists.txt +@@ -23,9 +23,5 @@ ecm_add_test( + Qt5::Test + KDev::Tests + KDev::Language +- +- # TODO: KF5: KDevice is forcing us to have this dependency. I'm sure +- # we can work-around it :) +- KF5::Archive + ) + +-- +2.19.1 + |