1 |
commit: 19e4afa42355a322a57e3b4345db00eaea75f003 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Feb 10 23:58:19 2015 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 2 21:21:52 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=19e4afa4 |
7 |
|
8 |
kde-apps/konq-plugins: Frameworks merged to master |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
Signed-off-by: Johannes Huber <johu <AT> gentoo.org> |
13 |
|
14 |
.../files/konq-plugins-ecmmarkastest.patch | 9 ++++++ |
15 |
kde-apps/konq-plugins/konq-plugins-9999.ebuild | 35 +++++++++++++++------- |
16 |
kde-apps/konq-plugins/metadata.xml | 3 ++ |
17 |
3 files changed, 37 insertions(+), 10 deletions(-) |
18 |
|
19 |
diff --git a/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch b/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch |
20 |
new file mode 100644 |
21 |
index 0000000..27f0ab8 |
22 |
--- /dev/null |
23 |
+++ b/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch |
24 |
@@ -0,0 +1,9 @@ |
25 |
+--- a/fsview/tests/CMakeLists.txt 2015-02-11 22:27:17.483424809 +0100 |
26 |
++++ b/fsview/tests/CMakeLists.txt 2015-02-11 22:29:56.069432617 +0100 |
27 |
+@@ -1,5 +1,6 @@ |
28 |
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) |
29 |
+ |
30 |
++include(ECMMarkAsTest) |
31 |
+ |
32 |
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) |
33 |
+ |
34 |
|
35 |
diff --git a/kde-apps/konq-plugins/konq-plugins-9999.ebuild b/kde-apps/konq-plugins/konq-plugins-9999.ebuild |
36 |
index 0f1611f..e6483ea 100644 |
37 |
--- a/kde-apps/konq-plugins/konq-plugins-9999.ebuild |
38 |
+++ b/kde-apps/konq-plugins/konq-plugins-9999.ebuild |
39 |
@@ -5,28 +5,43 @@ |
40 |
EAPI=6 |
41 |
|
42 |
KMNAME="kde-baseapps" |
43 |
-inherit kde4-meta |
44 |
+KDE_TEST="true" |
45 |
+inherit kde5 |
46 |
|
47 |
DESCRIPTION="Various plugins for konqueror" |
48 |
KEYWORDS="" |
49 |
-IUSE="debug tidy" |
50 |
+IUSE="speech tidy" |
51 |
|
52 |
DEPEND=" |
53 |
+ $(add_frameworks_dep karchive) |
54 |
+ $(add_frameworks_dep kcrash) |
55 |
+ $(add_frameworks_dep kdelibs4support) |
56 |
+ $(add_frameworks_dep kio) |
57 |
+ $(add_frameworks_dep khtml) |
58 |
+ $(add_frameworks_dep kparts) |
59 |
+ $(add_frameworks_dep kdesu) |
60 |
$(add_kdeapps_dep libkonq) |
61 |
- tidy? ( app-text/htmltidy ) |
62 |
+ $(add_qt_dep qtwidgets) |
63 |
+ speech? ( $(add_qt_dep qtspeech) ) |
64 |
+ tidy? ( |
65 |
+ $(add_frameworks_dep kiconthemes) |
66 |
+ $(add_frameworks_dep kwidgetsaddons) |
67 |
+ app-text/htmltidy |
68 |
+ ) |
69 |
" |
70 |
RDEPEND="${DEPEND} |
71 |
- !kde-misc/konq-plugins |
72 |
- $(add_kdeapps_dep kcmshell) |
73 |
$(add_kdeapps_dep konqueror) |
74 |
+ $(add_plasma_dep kde-cli-tools) |
75 |
" |
76 |
|
77 |
+S="${S}/${PN}" |
78 |
+ |
79 |
+PATCHES=( "${FILESDIR}/${PN}-ecmmarkastest.patch" ) |
80 |
+ |
81 |
src_configure() { |
82 |
local mycmakeargs=( |
83 |
- -DKdeWebKit=OFF |
84 |
- -DWebKitPart=OFF |
85 |
- -DWITH_LibTidy=$(usex tidy) |
86 |
+ $(cmake-utils_use_find_package speech Qt5TextToSpeech) |
87 |
+ $(cmake-utils_use_find_package tidy LibTidy) |
88 |
) |
89 |
- |
90 |
- kde4-meta_src_configure |
91 |
+ kde5_src_configure |
92 |
} |
93 |
|
94 |
diff --git a/kde-apps/konq-plugins/metadata.xml b/kde-apps/konq-plugins/metadata.xml |
95 |
index 2fdbf33..8ad5e62 100644 |
96 |
--- a/kde-apps/konq-plugins/metadata.xml |
97 |
+++ b/kde-apps/konq-plugins/metadata.xml |
98 |
@@ -5,4 +5,7 @@ |
99 |
<email>kde@g.o</email> |
100 |
<name>Gentoo KDE Project</name> |
101 |
</maintainer> |
102 |
+ <use> |
103 |
+ <flag name="speech">Build text-to-speech plugin</flag> |
104 |
+ </use> |
105 |
</pkgmetadata> |