| 1 |
commit: 1565dcd6efb5643711f477bee95b40a68a7358e8 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 12 16:27:13 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 12 16:27:13 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1565dcd6 |
| 7 |
|
| 8 |
kde-apps/kolf: Switch to pending upstream patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 11 |
|
| 12 |
kde-apps/kolf/files/kolf-18.08.1-deps.patch | 38 +++++++++++++++++++++++++++++ |
| 13 |
kde-apps/kolf/kolf-18.08.49.9999.ebuild | 5 +++- |
| 14 |
kde-apps/kolf/kolf-9999.ebuild | 4 ++- |
| 15 |
3 files changed, 45 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/kolf/files/kolf-18.08.1-deps.patch b/kde-apps/kolf/files/kolf-18.08.1-deps.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000000..a6b89b4023 |
| 20 |
--- /dev/null |
| 21 |
+++ b/kde-apps/kolf/files/kolf-18.08.1-deps.patch |
| 22 |
@@ -0,0 +1,38 @@ |
| 23 |
+From d5220258e7e652a6544cf80b2375c3fa185b1152 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 25 |
+Date: Wed, 12 Sep 2018 18:12:14 +0200 |
| 26 |
+Subject: [PATCH] Fix dependencies: add implicit, drop unused |
| 27 |
+ |
| 28 |
+--- |
| 29 |
+ CMakeLists.txt | 5 +++-- |
| 30 |
+ 1 file changed, 3 insertions(+), 2 deletions(-) |
| 31 |
+ |
| 32 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 33 |
+index 0221b84..d195569 100644 |
| 34 |
+--- a/CMakeLists.txt |
| 35 |
++++ b/CMakeLists.txt |
| 36 |
+@@ -7,18 +7,19 @@ set (KF5_MIN_VERSION "5.30.0") |
| 37 |
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) |
| 38 |
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) |
| 39 |
+ |
| 40 |
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets ) |
| 41 |
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Gui Widgets) |
| 42 |
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS |
| 43 |
++ Completion |
| 44 |
+ Config |
| 45 |
+ ConfigWidgets |
| 46 |
+ CoreAddons |
| 47 |
+ Crash |
| 48 |
+ DBusAddons |
| 49 |
++ DocTools |
| 50 |
+ I18n |
| 51 |
+ KDELibs4Support |
| 52 |
+ KIO |
| 53 |
+ WidgetsAddons |
| 54 |
+- WindowSystem |
| 55 |
+ XmlGui |
| 56 |
+ ) |
| 57 |
+ |
| 58 |
+-- |
| 59 |
+2.19.0 |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/kde-apps/kolf/kolf-18.08.49.9999.ebuild b/kde-apps/kolf/kolf-18.08.49.9999.ebuild |
| 63 |
index 473aca0df4..003cc9de03 100644 |
| 64 |
--- a/kde-apps/kolf/kolf-18.08.49.9999.ebuild |
| 65 |
+++ b/kde-apps/kolf/kolf-18.08.49.9999.ebuild |
| 66 |
@@ -3,7 +3,7 @@ |
| 67 |
|
| 68 |
EAPI=6 |
| 69 |
|
| 70 |
-KDE_HANDBOOK="true" |
| 71 |
+KDE_HANDBOOK="forceoptional" |
| 72 |
KDE_SELINUX_MODULE="games" |
| 73 |
inherit kde5 |
| 74 |
|
| 75 |
@@ -29,7 +29,10 @@ DEPEND=" |
| 76 |
$(add_kdeapps_dep libkdegames) |
| 77 |
$(add_qt_dep qtgui) |
| 78 |
$(add_qt_dep qtwidgets) |
| 79 |
+ media-libs/phonon |
| 80 |
" |
| 81 |
RDEPEND="${DEPEND} |
| 82 |
!kde-apps/kde4-l10n |
| 83 |
" |
| 84 |
+ |
| 85 |
+PATCHES=( "${FILESDIR}/${PN}-18.08.1-deps.patch" ) |
| 86 |
|
| 87 |
diff --git a/kde-apps/kolf/kolf-9999.ebuild b/kde-apps/kolf/kolf-9999.ebuild |
| 88 |
index 6bf1767a4b..003cc9de03 100644 |
| 89 |
--- a/kde-apps/kolf/kolf-9999.ebuild |
| 90 |
+++ b/kde-apps/kolf/kolf-9999.ebuild |
| 91 |
@@ -3,7 +3,7 @@ |
| 92 |
|
| 93 |
EAPI=6 |
| 94 |
|
| 95 |
-KDE_HANDBOOK="true" |
| 96 |
+KDE_HANDBOOK="forceoptional" |
| 97 |
KDE_SELINUX_MODULE="games" |
| 98 |
inherit kde5 |
| 99 |
|
| 100 |
@@ -34,3 +34,5 @@ DEPEND=" |
| 101 |
RDEPEND="${DEPEND} |
| 102 |
!kde-apps/kde4-l10n |
| 103 |
" |
| 104 |
+ |
| 105 |
+PATCHES=( "${FILESDIR}/${PN}-18.08.1-deps.patch" ) |
Archives