summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-04-01 16:01:49 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-04-01 16:04:00 +0200
commitf17b08710c0faefc7ed8026806277e8abc512254 (patch)
treed965e2bbc2193ee4cb3967c2ef9d9da4f9e2b185 /dev-vcs
parentdev-ruby/hiera: amd64 stable wrt bug #580100 (diff)
downloadgentoo-f17b08710c0faefc7ed8026806277e8abc512254.tar.gz
gentoo-f17b08710c0faefc7ed8026806277e8abc512254.tar.bz2
gentoo-f17b08710c0faefc7ed8026806277e8abc512254.zip
dev-vcs/kdesvn: Fix bogus dependency
Reported-by: Coacher <itumaykin+gentoo@gmail.com> Gentoo-bug: 614248 Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch47
-rw-r--r--dev-vcs/kdesvn/kdesvn-2.0.0.ebuild5
2 files changed, 51 insertions, 1 deletions
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch
new file mode 100644
index 000000000000..d943ded7d74f
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-deps.patch
@@ -0,0 +1,47 @@
+commit f62020c59ffb2d8ec84ff3328dddc06cd57d73ed
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat Apr 1 15:12:20 2017 +0200
+
+ Replace KF5TextEditor with actual implicit deps
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 08a2104a..53d279fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,13 +46,14 @@ include(FeatureSummary)
+ include(ECMInstallIcons)
+
+ find_package(KF5 REQUIRED COMPONENTS
+- Bookmarks Config ConfigWidgets CoreAddons
+- DBusAddons DocTools I18n IconThemes ItemViews
+- JobWidgets KIO Notifications Parts Service
+- TextEditor Wallet WidgetsAddons
++ Bookmarks Codecs Completion Config
++ ConfigWidgets CoreAddons DBusAddons DocTools
++ I18n IconThemes ItemViews JobWidgets KIO
++ Notifications Parts Service TextWidgets
++ Wallet WidgetsAddons XmlGui
+ )
+ find_package(Qt5 REQUIRED COMPONENTS
+- Core DBus Gui Sql Widgets
++ Core DBus Gui Sql Widgets Xml
+ )
+
+ # Set the version
+diff --git a/src/ksvnwidgets/CMakeLists.txt b/src/ksvnwidgets/CMakeLists.txt
+index 44b8d219..2b0087c8 100644
+--- a/src/ksvnwidgets/CMakeLists.txt
++++ b/src/ksvnwidgets/CMakeLists.txt
+@@ -79,5 +79,11 @@ target_link_libraries(ksvnwidgets
+ PUBLIC
+ svnqt
+ Qt5::Widgets
+- KF5::TextEditor
++ KF5::Completion
++ KF5::ConfigWidgets
++ KF5::I18n
++ KF5::KIOWidgets
++ KF5::Parts
++ KF5::TextWidgets
++ KF5::XmlGui
+ )
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
index fa5e12004bcb..a2425ef558e8 100644
--- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
@@ -50,7 +50,10 @@ RDEPEND="${DEPEND}
!kde-apps/kdesdk-kioslaves:4[subversion(-)]
"
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-desktop.patch"
+ "${FILESDIR}/${P}-deps.patch"
+)
src_prepare(){
kde5_src_prepare