[gentoo-commits] proj/kde:master commit in: kde-plasma/ksysguard/files/, kde-plasma/ksysguard/

[gentoo-commits] proj/kde:master commit in: kde-plasma/ksysguard/files/, kde-plasma/ksysguard/

[Michael Palimaka]

commit:     68eb79cc075680ce372f22d13eeec5591a120bc8
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 11:01:27 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 11:04:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=68eb79cc

kde-plasma/ksysguard: add patch to ensure that GUI is always built

Package-Manager: portage-2.3.0_rc1

 .../ksysguard/files/ksysguard-5.6.5-gui.patch      | 40 ++++++++++++++++++++++
 kde-plasma/ksysguard/ksysguard-5.6.95.ebuild       |  2 ++
 kde-plasma/ksysguard/ksysguard-5.7.49.9999.ebuild  |  2 ++
 kde-plasma/ksysguard/ksysguard-9999.ebuild         |  2 ++
 4 files changed, 46 insertions(+)

diff --git a/kde-plasma/ksysguard/files/ksysguard-5.6.5-gui.patch b/kde-plasma/ksysguard/files/ksysguard-5.6.5-gui.patch
new file mode 100644
index 0000000..afd9800
--- /dev/null
+++ b/kde-plasma/ksysguard/files/ksysguard-5.6.5-gui.patch
@@ -0,0 +1,40 @@
+From 181202b59dcda03ec3f13de5a79336da4247c447 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Fri, 17 Jun 2016 05:42:23 +1000
+Subject: [PATCH] Remove Qt5WebKitWidgets dependency and build gui
+ unconditionally.
+
+Summary: Qt5WebKitWidgets is not actually used anywhere.
+
+Reviewers: #plasma, sgaist
+
+Differential Revision: https://phabricator.kde.org/D1919
+---
+ CMakeLists.txt | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 56aaafc..5ee0946 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,16 +46,7 @@ set_package_properties(Sensors PROPERTIES
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ configure_file(config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
+ 
+-find_package(Qt5WebKitWidgets CONFIG)
+-set_package_properties(Qt5WebKitWidgets PROPERTIES
+-                       URL "git://gitorious.org/qt/qtwebkit.git"
+-                       DESCRIPTION "Qt Webkit module (web browsing engine)"
+-                       TYPE OPTIONAL
+-                       PURPOSE "Used by the HTML-based GUI ksysguard library"
+-                      )
+-if(Qt5WebKitWidgets_FOUND)
+-    add_subdirectory( gui )
+-endif()
++add_subdirectory( gui )
+ 
+ add_subdirectory( doc )
+ add_subdirectory( pics )
+-- 
+2.7.3
+

diff --git a/kde-plasma/ksysguard/ksysguard-5.6.95.ebuild b/kde-plasma/ksysguard/ksysguard-5.6.95.ebuild
index d06d13d..d004d05 100644
--- a/kde-plasma/ksysguard/ksysguard-5.6.95.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.6.95.ebuild
@@ -39,6 +39,8 @@ RDEPEND="${DEPEND}
 	!kde-base/ksysguard:4
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.6.5-gui.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package lm_sensors Sensors)

diff --git a/kde-plasma/ksysguard/ksysguard-5.7.49.9999.ebuild b/kde-plasma/ksysguard/ksysguard-5.7.49.9999.ebuild
index e6b3842..7b3a915 100644
--- a/kde-plasma/ksysguard/ksysguard-5.7.49.9999.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.7.49.9999.ebuild
@@ -39,6 +39,8 @@ RDEPEND="${DEPEND}
 	!kde-base/ksysguard:4
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.6.5-gui.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package lm_sensors Sensors)

diff --git a/kde-plasma/ksysguard/ksysguard-9999.ebuild b/kde-plasma/ksysguard/ksysguard-9999.ebuild
index e6b3842..7b3a915 100644
--- a/kde-plasma/ksysguard/ksysguard-9999.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-9999.ebuild
@@ -39,6 +39,8 @@ RDEPEND="${DEPEND}
 	!kde-base/ksysguard:4
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.6.5-gui.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package lm_sensors Sensors)