| 1 |
commit: 6c4cb4d20253d8a158e9bdbc386ac1aab9e52ced |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 7 06:22:32 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 7 06:25:46 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4cb4d2 |
| 7 |
|
| 8 |
kde-plasma/libksysguard: Remove unused dep |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../files/libksysguard-5.10.4-unused-dep.patch | 56 ++++++++++++++++++++++ |
| 13 |
kde-plasma/libksysguard/libksysguard-5.10.4.ebuild | 2 + |
| 14 |
2 files changed, 58 insertions(+) |
| 15 |
|
| 16 |
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch b/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..f76c8df1cbf |
| 19 |
--- /dev/null |
| 20 |
+++ b/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch |
| 21 |
@@ -0,0 +1,56 @@ |
| 22 |
+From b6ed1afd8a8a4104a9fcf09c3322bf6d69231622 Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Allan Sandfeld Jensen <allan.jensen@××.io> |
| 24 |
+Date: Mon, 7 Aug 2017 00:25:11 +0200 |
| 25 |
+Subject: libksysguard does not appear to use QtScript, but just includes it. |
| 26 |
+ |
| 27 |
+Removing it makes it build with a clean Qt5.9 where QtScript no longer exists. |
| 28 |
+ |
| 29 |
+Reviewed by: davidedmundson |
| 30 |
+ |
| 31 |
+Differential Revision: https://phabricator.kde.org/D7036 |
| 32 |
+--- |
| 33 |
+ CMakeLists.txt | 2 +- |
| 34 |
+ processui/CMakeLists.txt | 1 - |
| 35 |
+ processui/scripting.cpp | 2 -- |
| 36 |
+ 3 files changed, 1 insertion(+), 4 deletions(-) |
| 37 |
+ |
| 38 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 39 |
+index 84a4479..83987ad 100644 |
| 40 |
+--- a/CMakeLists.txt |
| 41 |
++++ b/CMakeLists.txt |
| 42 |
+@@ -9,7 +9,7 @@ include(WriteBasicConfigVersionFile) |
| 43 |
+ find_package(ECM 1.2.0 REQUIRED NO_MODULE) |
| 44 |
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) |
| 45 |
+ |
| 46 |
+-find_package(Qt5 REQUIRED CONFIG COMPONENTS DBus Network Widgets Script) |
| 47 |
++find_package(Qt5 REQUIRED CONFIG COMPONENTS DBus Network Widgets) |
| 48 |
+ find_package(Qt5WebKitWidgets CONFIG) |
| 49 |
+ set_package_properties(Qt5WebKitWidgets PROPERTIES |
| 50 |
+ URL "git://gitorious.org/qt/qtwebkit.git" |
| 51 |
+diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt |
| 52 |
+index 1927839..4dfcbd4 100644 |
| 53 |
+--- a/processui/CMakeLists.txt |
| 54 |
++++ b/processui/CMakeLists.txt |
| 55 |
+@@ -35,7 +35,6 @@ target_link_libraries(processui |
| 56 |
+ KF5::ConfigCore |
| 57 |
+ PRIVATE |
| 58 |
+ Qt5::DBus |
| 59 |
+- Qt5::Script |
| 60 |
+ KF5::I18n |
| 61 |
+ KF5::WindowSystem |
| 62 |
+ KF5::Auth |
| 63 |
+diff --git a/processui/scripting.cpp b/processui/scripting.cpp |
| 64 |
+index 2aa7088..afdf949 100644 |
| 65 |
+--- a/processui/scripting.cpp |
| 66 |
++++ b/processui/scripting.cpp |
| 67 |
+@@ -28,8 +28,6 @@ |
| 68 |
+ #include <QDirIterator> |
| 69 |
+ #include <QFile> |
| 70 |
+ #include <QFileInfo> |
| 71 |
+-#include <QScriptValue> |
| 72 |
+-#include <QScriptContext> |
| 73 |
+ #include <QTextStream> |
| 74 |
+ #include <QDialog> |
| 75 |
+ #include <QUrl> |
| 76 |
+-- |
| 77 |
+cgit v0.11.2 |
| 78 |
|
| 79 |
diff --git a/kde-plasma/libksysguard/libksysguard-5.10.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.10.4.ebuild |
| 80 |
index ec3503698dd..a05dfa328b5 100644 |
| 81 |
--- a/kde-plasma/libksysguard/libksysguard-5.10.4.ebuild |
| 82 |
+++ b/kde-plasma/libksysguard/libksysguard-5.10.4.ebuild |
| 83 |
@@ -42,6 +42,8 @@ DEPEND="${COMMON_DEPEND} |
| 84 |
X? ( x11-proto/xproto ) |
| 85 |
" |
| 86 |
|
| 87 |
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" ) |
| 88 |
+ |
| 89 |
src_configure() { |
| 90 |
local mycmakeargs=( |
| 91 |
$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets) |
Archives