| 1 |
commit: 0d1e5903c0fc404a9d7a78aa98353b716c5dfbf2 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 27 10:36:48 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 27 10:37:59 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d1e5903 |
| 7 |
|
| 8 |
kde-apps/dolphin: backport patch from upstream to fix bogus deps. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
kde-apps/dolphin/dolphin-15.08.0.ebuild | 2 + |
| 13 |
kde-apps/dolphin/dolphin-15.08.49.9999.ebuild | 2 + |
| 14 |
kde-apps/dolphin/files/dolphin-15.08.0-deps.patch | 48 +++++++++++++++++++++++ |
| 15 |
3 files changed, 52 insertions(+) |
| 16 |
|
| 17 |
diff --git a/kde-apps/dolphin/dolphin-15.08.0.ebuild b/kde-apps/dolphin/dolphin-15.08.0.ebuild |
| 18 |
index 6dabf46..a00333c 100644 |
| 19 |
--- a/kde-apps/dolphin/dolphin-15.08.0.ebuild |
| 20 |
+++ b/kde-apps/dolphin/dolphin-15.08.0.ebuild |
| 21 |
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND} |
| 22 |
|
| 23 |
RESTRICT="test" |
| 24 |
|
| 25 |
+PATCHES=( "${FILESDIR}/${PN}-15.08.0-deps.patch" ) |
| 26 |
+ |
| 27 |
src_configure() { |
| 28 |
local mycmakeargs=( |
| 29 |
$(cmake-utils_use_with semantic-desktop KF5Baloo) |
| 30 |
|
| 31 |
diff --git a/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild b/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild |
| 32 |
index 0e90513..0e8c7c7 100644 |
| 33 |
--- a/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild |
| 34 |
+++ b/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild |
| 35 |
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND} |
| 36 |
|
| 37 |
RESTRICT="test" |
| 38 |
|
| 39 |
+PATCHES=( "${FILESDIR}/${PN}-15.08.0-deps.patch" ) |
| 40 |
+ |
| 41 |
src_configure() { |
| 42 |
local mycmakeargs=( |
| 43 |
$(cmake-utils_use_with semantic-desktop KF5Baloo) |
| 44 |
|
| 45 |
diff --git a/kde-apps/dolphin/files/dolphin-15.08.0-deps.patch b/kde-apps/dolphin/files/dolphin-15.08.0-deps.patch |
| 46 |
new file mode 100644 |
| 47 |
index 0000000..43ae391 |
| 48 |
--- /dev/null |
| 49 |
+++ b/kde-apps/dolphin/files/dolphin-15.08.0-deps.patch |
| 50 |
@@ -0,0 +1,48 @@ |
| 51 |
+From 4c0d110b2d36153a564602223b4dd3e04b1f4158 Mon Sep 17 00:00:00 2001 |
| 52 |
+From: Michael Palimaka <kensington@g.o> |
| 53 |
+Date: Wed, 26 Aug 2015 22:53:44 +1000 |
| 54 |
+Subject: [PATCH] Update dependencies. |
| 55 |
+ |
| 56 |
+It appears that KF5TextEditor was added for KTextEdit, but that is actually |
| 57 |
+provided by KF5TextWidgets. It's then necessary to explicitly link to KF5Parts |
| 58 |
+(it was previously brought in implicitly by KF5TextEditor). |
| 59 |
+ |
| 60 |
+REVIEW: 124932 |
| 61 |
+--- |
| 62 |
+ CMakeLists.txt | 2 +- |
| 63 |
+ src/CMakeLists.txt | 3 ++- |
| 64 |
+ 2 files changed, 3 insertions(+), 2 deletions(-) |
| 65 |
+ |
| 66 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 67 |
+index b56fd7a..a5580e9 100644 |
| 68 |
+--- a/CMakeLists.txt |
| 69 |
++++ b/CMakeLists.txt |
| 70 |
+@@ -62,7 +62,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS |
| 71 |
+ Solid |
| 72 |
+ IconThemes |
| 73 |
+ Completion |
| 74 |
+- TextEditor |
| 75 |
++ TextWidgets |
| 76 |
+ WindowSystem |
| 77 |
+ Notifications |
| 78 |
+ ) |
| 79 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 80 |
+index 2a5e5a6..9689923 100644 |
| 81 |
+--- a/src/CMakeLists.txt |
| 82 |
++++ b/src/CMakeLists.txt |
| 83 |
+@@ -143,10 +143,11 @@ target_link_libraries( |
| 84 |
+ KF5::KIOWidgets |
| 85 |
+ KF5::KIOFileWidgets |
| 86 |
+ KF5::Completion |
| 87 |
+- KF5::TextEditor |
| 88 |
++ KF5::TextWidgets |
| 89 |
+ KF5::WindowSystem |
| 90 |
+ KF5::ConfigCore |
| 91 |
+ KF5::NewStuff |
| 92 |
++ KF5::Parts |
| 93 |
+ ) |
| 94 |
+ |
| 95 |
+ if(HAVE_BALOO) |
| 96 |
+-- |
| 97 |
+2.4.6 |
| 98 |
+ |
Archives