| 1 |
commit: f17b08710c0faefc7ed8026806277e8abc512254 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 1 14:01:49 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 1 14:04:00 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17b0871 |
| 7 |
|
| 8 |
dev-vcs/kdesvn: Fix bogus dependency |
| 9 |
|
| 10 |
Reported-by: Coacher <itumaykin+gentoo <AT> gmail.com> |
| 11 |
Gentoo-bug: 614248 |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 14 |
|
| 15 |
dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch | 47 ++++++++++++++++++++++++++++ |
| 16 |
dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 5 ++- |
| 17 |
2 files changed, 51 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..d943ded7d74 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch |
| 24 |
@@ -0,0 +1,47 @@ |
| 25 |
+commit f62020c59ffb2d8ec84ff3328dddc06cd57d73ed |
| 26 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 27 |
+Date: Sat Apr 1 15:12:20 2017 +0200 |
| 28 |
+ |
| 29 |
+ Replace KF5TextEditor with actual implicit deps |
| 30 |
+ |
| 31 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 32 |
+index 08a2104a..53d279fc 100644 |
| 33 |
+--- a/CMakeLists.txt |
| 34 |
++++ b/CMakeLists.txt |
| 35 |
+@@ -46,13 +46,14 @@ include(FeatureSummary) |
| 36 |
+ include(ECMInstallIcons) |
| 37 |
+ |
| 38 |
+ find_package(KF5 REQUIRED COMPONENTS |
| 39 |
+- Bookmarks Config ConfigWidgets CoreAddons |
| 40 |
+- DBusAddons DocTools I18n IconThemes ItemViews |
| 41 |
+- JobWidgets KIO Notifications Parts Service |
| 42 |
+- TextEditor Wallet WidgetsAddons |
| 43 |
++ Bookmarks Codecs Completion Config |
| 44 |
++ ConfigWidgets CoreAddons DBusAddons DocTools |
| 45 |
++ I18n IconThemes ItemViews JobWidgets KIO |
| 46 |
++ Notifications Parts Service TextWidgets |
| 47 |
++ Wallet WidgetsAddons XmlGui |
| 48 |
+ ) |
| 49 |
+ find_package(Qt5 REQUIRED COMPONENTS |
| 50 |
+- Core DBus Gui Sql Widgets |
| 51 |
++ Core DBus Gui Sql Widgets Xml |
| 52 |
+ ) |
| 53 |
+ |
| 54 |
+ # Set the version |
| 55 |
+diff --git a/src/ksvnwidgets/CMakeLists.txt b/src/ksvnwidgets/CMakeLists.txt |
| 56 |
+index 44b8d219..2b0087c8 100644 |
| 57 |
+--- a/src/ksvnwidgets/CMakeLists.txt |
| 58 |
++++ b/src/ksvnwidgets/CMakeLists.txt |
| 59 |
+@@ -79,5 +79,11 @@ target_link_libraries(ksvnwidgets |
| 60 |
+ PUBLIC |
| 61 |
+ svnqt |
| 62 |
+ Qt5::Widgets |
| 63 |
+- KF5::TextEditor |
| 64 |
++ KF5::Completion |
| 65 |
++ KF5::ConfigWidgets |
| 66 |
++ KF5::I18n |
| 67 |
++ KF5::KIOWidgets |
| 68 |
++ KF5::Parts |
| 69 |
++ KF5::TextWidgets |
| 70 |
++ KF5::XmlGui |
| 71 |
+ ) |
| 72 |
|
| 73 |
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild |
| 74 |
index fa5e12004bc..a2425ef558e 100644 |
| 75 |
--- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild |
| 76 |
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild |
| 77 |
@@ -50,7 +50,10 @@ RDEPEND="${DEPEND} |
| 78 |
!kde-apps/kdesdk-kioslaves:4[subversion(-)] |
| 79 |
" |
| 80 |
|
| 81 |
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" ) |
| 82 |
+PATCHES=( |
| 83 |
+ "${FILESDIR}/${P}-desktop.patch" |
| 84 |
+ "${FILESDIR}/${P}-deps.patch" |
| 85 |
+) |
| 86 |
|
| 87 |
src_prepare(){ |
| 88 |
kde5_src_prepare |
Archives