diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2015-04-17 03:48:07 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-04-17 03:48:07 +1000 |
| commit | e94bc0a13ca9dde47fa0d4348e7a9de174fded27 (patch) | |
| tree | 8b3940837ab8e59a8a11cc6452c6a4b058ead35d | |
| parent | e297ab57729b27658bcf7be738bfe481dd9daea5 (diff) | |
| download | kde-e94bc0a13ca9dde47fa0d4348e7a9de174fded27.tar.gz kde-e94bc0a13ca9dde47fa0d4348e7a9de174fded27.tar.bz2 kde-e94bc0a13ca9dde47fa0d4348e7a9de174fded27.zip | |
[kde-apps/okular] Punt bogus deps wrt bug #546118.
Package-Manager: portage-2.2.18
| -rw-r--r-- | kde-apps/okular/files/okular-5.9999-tests-optional.patch | 21 | ||||
| -rw-r--r-- | kde-apps/okular/okular-5.9999.ebuild | 8 |
2 files changed, 1 insertions, 28 deletions
diff --git a/kde-apps/okular/files/okular-5.9999-tests-optional.patch b/kde-apps/okular/files/okular-5.9999-tests-optional.patch deleted file mode 100644 index 309c0921c1a..00000000000 --- a/kde-apps/okular/files/okular-5.9999-tests-optional.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/CMakeLists.txt 2015-02-23 23:12:24.420881583 +0100 -+++ b/CMakeLists.txt 2015-02-23 23:17:07.173858317 +0100 -@@ -18,7 +18,17 @@ - include(ECMAddTests) - - --find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Test Widgets PrintSupport Svg Qml Quick) -+find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Widgets PrintSupport Svg Qml Quick) -+ -+find_package(Qt5Test CONFIG QUIET) -+set_package_properties(Qt5Test PROPERTIES -+ PURPOSE "Required for tests" -+ TYPE OPTIONAL) -+add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests") -+if (NOT Qt5Test_FOUND) -+ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") -+endif() -+ - find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech) - if (NOT Qt5TextToSpeech_FOUND) - message(STATUS "Qt5TextToSpeech not found, speech features will be disabled") diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild index e898d1c828f..24767e2e1f8 100644 --- a/kde-apps/okular/okular-5.9999.ebuild +++ b/kde-apps/okular/okular-5.9999.ebuild @@ -5,6 +5,7 @@ EAPI=5 KDE_HANDBOOK="true" +KDE_PUNT_BOGUS_DEPS="true" EGIT_BRANCH="frameworks" inherit kde5 @@ -59,13 +60,6 @@ RDEPEND="${DEPEND} RESTRICT=test # test 2: parttest hangs -src_prepare() { - # whole patch should be upstreamed, doesn't work in PATCHES - epatch "${FILESDIR}/${PN}-5.9999-tests-optional.patch" - - kde5_src_prepare -} - src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package chm CHM) |