diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-21 00:55:27 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-21 00:56:25 +0200 |
| commit | 40344977cca595b82e3fd69d98f810a0df612643 (patch) | |
| tree | 11245f6944d68fd72bff13b64eccc348030b4129 | |
| parent | a0ad3be9232134f04b2e45d6e8989ba43a4420ea (diff) | |
| download | kde-40344977cca595b82e3fd69d98f810a0df612643.tar.gz kde-40344977cca595b82e3fd69d98f810a0df612643.tar.bz2 kde-40344977cca595b82e3fd69d98f810a0df612643.zip | |
kde-plasma/drkonqi: Fix build with USE=-X
Gentoo-bug: 634510
Package-Manager: Portage-2.3.12, Repoman-2.3.3
| -rw-r--r-- | kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch | 46 |
2 files changed, 48 insertions, 0 deletions
diff --git a/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild b/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild index cac85706322..a21d1fd143d 100644 --- a/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild +++ b/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild @@ -39,6 +39,8 @@ RDEPEND="${COMMON_DEPEND} !<kde-plasma/plasma-workspace-5.10.95:5 " +PATCHES=( "${FILESDIR}/${PN}-5.11.1-x11.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package X Qt5X11Extras) diff --git a/kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch b/kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch new file mode 100644 index 00000000000..ffbd25c4f71 --- /dev/null +++ b/kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch @@ -0,0 +1,46 @@ +From c5047038751052c3feb588496cd14bdb233a18f8 Mon Sep 17 00:00:00 2001 +From: Kevin Funk <kfunk@kde.org> +Date: Sun, 15 Oct 2017 18:52:53 +0200 +Subject: Make Qt5::X11Extras really optional + +Summary: +Otherwise may fail. + +Reviewers: rjvbb, sitter, davidedmundson + +Reviewed By: sitter, davidedmundson + +Subscribers: apol, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D8307 +--- + CMakeLists.txt | 2 +- + config-X11.h.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 43eeea5..8c8f9b2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,7 +30,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets Test + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n CoreAddons Service ConfigWidgets JobWidgets KIO Crash Completion XmlRpcClient WidgetsAddons Wallet Notifications IdleTime) + +-find_package(Qt5 ${QT_MIN_VERSION} CONFIG COMPONENTS X11Extras) ++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG) + + include_directories("${CMAKE_CURRENT_BINARY_DIR}") + configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) +diff --git a/config-X11.h.cmake b/config-X11.h.cmake +index 26064aa..2f779a2 100644 +--- a/config-X11.h.cmake ++++ b/config-X11.h.cmake +@@ -1,2 +1,2 @@ +-#cmakedefine Qt5X11Extras_FOUND 1 ++#cmakedefine01 Qt5X11Extras_FOUND + #define HAVE_X11 Qt5X11Extras_FOUND +-- +cgit v0.11.2 + |