commit: 77a1463d2b54754a79129baa63dc14b0b0139459
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon May 16 23:39:09 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 18:06:12 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=77a1463d
kde-apps/konqueror: Add KMEXTRA=dolphin for USE=filemanager
Gentoo-bug: 562224
Package-Manager: portage-2.2.28
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
kde-apps/konqueror/konqueror-16.04.3.ebuild | 44 ++++++++++++++++++++---
kde-apps/konqueror/konqueror-16.04.49.9999.ebuild | 44 ++++++++++++++++++++---
kde-apps/konqueror/konqueror-9999.ebuild | 44 ++++++++++++++++++++---
kde-apps/konqueror/metadata.xml | 1 +
4 files changed, 121 insertions(+), 12 deletions(-)
diff --git a/kde-apps/konqueror/konqueror-16.04.3.ebuild
b/kde-apps/konqueror/konqueror-16.04.3.ebuild
index 09426ea..38fe745 100644
--- a/kde-apps/konqueror/konqueror-16.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-16.04.3.ebuild
@@ -14,12 +14,17 @@ HOMEPAGE="
https://konqueror.org/
"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+bookmarks debug svg"
+IUSE="+bookmarks debug +filemanager svg"
# 4 of 4 tests fail. Last checked for 4.0.3
RESTRICT="test"
DEPEND="
$(add_kdeapps_dep libkonq)
+ filemanager? (
+ $(add_kdebase_dep kactivities '' 4.13)
+ media-libs/phonon[qt4]
+ x11-libs/libXrender
+ )
"
# bug #544630: evince[nsplugin] crashes konqueror
@@ -28,8 +33,18 @@ RDEPEND="${DEPEND}
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep kurifilter-plugins)
bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
+ filemanager? (
+ $(add_kdeapps_dep kdebase-kioslaves)
+ $(add_kdeapps_dep kfind)
+ $(add_kdeapps_dep konsolepart)
+ )
svg? ( $(add_kdeapps_dep svgpart) )
!app-text/evince[nsplugin]
+ !kde-apps/dolphin:4
+"
+
+KMEXTRA="
+ dolphin/
"
KMEXTRACTONLY="
@@ -40,6 +55,14 @@ KMEXTRACTONLY="
src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+ use filemanager || cmake_comment_add_subdirectory dolphin
+
+ # required for dolphin
+ sed -e "/konq_copytomenu.h/ s/# //" \
+ -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
+ -i lib/konq/CMakeLists.txt \
+ || die "Failed to fix libkonq CMakeLists.txt"
+
kde4-meta_src_prepare
# Do not install *.desktop files for kfmclient
@@ -47,12 +70,25 @@ src_prepare() {
|| die "Failed to omit .desktop files"
}
+src_configure() {
+ local mycmakeargs
+
+ if use filemanager ; then
+ mycmakeargs=(
+ -DWITH_Baloo=OFF
+ -DWITH_BalooWidgets=OFF
+ -DWITH_KFileMetaData=OFF
+ )
+ fi
+
+ kde4-meta_src_configure
+}
+
pkg_postinst() {
kde4-meta_pkg_postinst
- if ! has_version kde-apps/dolphin:${SLOT} ; then
- elog "If you want to use konqueror as a filemanager, install
the dolphin kpart:"
- elog "kde-apps/dolphin:${SLOT}"
+ if use filemanager && ! has_version media-gfx/icoutils ; then
+ elog "For .exe file preview support, install
media-gfx/icoutils."
fi
if ! has_version virtual/jre ; then
diff --git a/kde-apps/konqueror/konqueror-16.04.49.9999.ebuild
b/kde-apps/konqueror/konqueror-16.04.49.9999.ebuild
index 4e181da..8dd0e92 100644
--- a/kde-apps/konqueror/konqueror-16.04.49.9999.ebuild
+++ b/kde-apps/konqueror/konqueror-16.04.49.9999.ebuild
@@ -14,12 +14,17 @@ HOMEPAGE="
https://konqueror.org/
"
KEYWORDS=""
-IUSE="+bookmarks debug svg"
+IUSE="+bookmarks debug +filemanager svg"
# 4 of 4 tests fail. Last checked for 4.0.3
RESTRICT="test"
DEPEND="
$(add_kdeapps_dep libkonq)
+ filemanager? (
+ $(add_kdebase_dep kactivities '' 4.13)
+ media-libs/phonon[qt4]
+ x11-libs/libXrender
+ )
"
# bug #544630: evince[nsplugin] crashes konqueror
@@ -28,8 +33,18 @@ RDEPEND="${DEPEND}
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep kurifilter-plugins)
bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
+ filemanager? (
+ $(add_kdeapps_dep kdebase-kioslaves)
+ $(add_kdeapps_dep kfind)
+ $(add_kdeapps_dep konsolepart)
+ )
svg? ( $(add_kdeapps_dep svgpart) )
!app-text/evince[nsplugin]
+ !kde-apps/dolphin:4
+"
+
+KMEXTRA="
+ dolphin/
"
KMEXTRACTONLY="
@@ -40,6 +55,14 @@ KMEXTRACTONLY="
src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+ use filemanager || cmake_comment_add_subdirectory dolphin
+
+ # required for dolphin
+ sed -e "/konq_copytomenu.h/ s/# //" \
+ -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
+ -i lib/konq/CMakeLists.txt \
+ || die "Failed to fix libkonq CMakeLists.txt"
+
kde4-meta_src_prepare
# Do not install *.desktop files for kfmclient
@@ -47,12 +70,25 @@ src_prepare() {
|| die "Failed to omit .desktop files"
}
+src_configure() {
+ local mycmakeargs
+
+ if use filemanager ; then
+ mycmakeargs=(
+ -DWITH_Baloo=OFF
+ -DWITH_BalooWidgets=OFF
+ -DWITH_KFileMetaData=OFF
+ )
+ fi
+
+ kde4-meta_src_configure
+}
+
pkg_postinst() {
kde4-meta_pkg_postinst
- if ! has_version kde-apps/dolphin:${SLOT} ; then
- elog "If you want to use konqueror as a filemanager, install
the dolphin kpart:"
- elog "kde-apps/dolphin:${SLOT}"
+ if use filemanager && ! has_version media-gfx/icoutils ; then
+ elog "For .exe file preview support, install
media-gfx/icoutils."
fi
if ! has_version virtual/jre ; then
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild
b/kde-apps/konqueror/konqueror-9999.ebuild
index 4e181da..8dd0e92 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-9999.ebuild
@@ -14,12 +14,17 @@ HOMEPAGE="
https://konqueror.org/
"
KEYWORDS=""
-IUSE="+bookmarks debug svg"
+IUSE="+bookmarks debug +filemanager svg"
# 4 of 4 tests fail. Last checked for 4.0.3
RESTRICT="test"
DEPEND="
$(add_kdeapps_dep libkonq)
+ filemanager? (
+ $(add_kdebase_dep kactivities '' 4.13)
+ media-libs/phonon[qt4]
+ x11-libs/libXrender
+ )
"
# bug #544630: evince[nsplugin] crashes konqueror
@@ -28,8 +33,18 @@ RDEPEND="${DEPEND}
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep kurifilter-plugins)
bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
+ filemanager? (
+ $(add_kdeapps_dep kdebase-kioslaves)
+ $(add_kdeapps_dep kfind)
+ $(add_kdeapps_dep konsolepart)
+ )
svg? ( $(add_kdeapps_dep svgpart) )
!app-text/evince[nsplugin]
+ !kde-apps/dolphin:4
+"
+
+KMEXTRA="
+ dolphin/
"
KMEXTRACTONLY="
@@ -40,6 +55,14 @@ KMEXTRACTONLY="
src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+ use filemanager || cmake_comment_add_subdirectory dolphin
+
+ # required for dolphin
+ sed -e "/konq_copytomenu.h/ s/# //" \
+ -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
+ -i lib/konq/CMakeLists.txt \
+ || die "Failed to fix libkonq CMakeLists.txt"
+
kde4-meta_src_prepare
# Do not install *.desktop files for kfmclient
@@ -47,12 +70,25 @@ src_prepare() {
|| die "Failed to omit .desktop files"
}
+src_configure() {
+ local mycmakeargs
+
+ if use filemanager ; then
+ mycmakeargs=(
+ -DWITH_Baloo=OFF
+ -DWITH_BalooWidgets=OFF
+ -DWITH_KFileMetaData=OFF
+ )
+ fi
+
+ kde4-meta_src_configure
+}
+
pkg_postinst() {
kde4-meta_pkg_postinst
- if ! has_version kde-apps/dolphin:${SLOT} ; then
- elog "If you want to use konqueror as a filemanager, install
the dolphin kpart:"
- elog "kde-apps/dolphin:${SLOT}"
+ if use filemanager && ! has_version media-gfx/icoutils ; then
+ elog "For .exe file preview support, install
media-gfx/icoutils."
fi
if ! has_version virtual/jre ; then
diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index c1da49e..146bea6 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<use>
<flag name="bookmarks">Add dependency on bookmark
package.</flag>
+ <flag name="filemanager">Install the dolphin kpart for use as a
file manager.</flag>
</use>
</pkgmetadata>
