commit:     52119f2eb4ddc5113df09d07274e1919e37ac77a
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 13:31:21 2016 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 13:31:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52119f2e

net-misc/nextcloud-client: desktop fixes

Fix dolphin integration, thanks Felix Tiede in bug #600116
Fix menu icon, bug #601150

Package-Manager: portage-2.3.2

 .../files/nextcloud-client-2.2.4-dolphin.patch     |  28 ++++++
 .../nextcloud-client-2.2.4-r2.ebuild               | 109 +++++++++++++++++++++
 2 files changed, 137 insertions(+)

diff --git 
a/net-misc/nextcloud-client/files/nextcloud-client-2.2.4-dolphin.patch 
b/net-misc/nextcloud-client/files/nextcloud-client-2.2.4-dolphin.patch
new file mode 100644
index 00000000..eea7fad
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.2.4-dolphin.patch
@@ -0,0 +1,28 @@
+--- a/client/shell_integration/dolphin/CMakeLists.txt
++++ b/client/shell_integration/dolphin/CMakeLists.txt
+@@ -49,5 +49,6 @@ target_link_libraries(${OWNCLOUDDOLPHINOVERLAYPLUGIN} 
KF5::CoreAddons KF5::KIOCo
+ set(OWNCLOUDDOLPHINACTIONPLUGIN ${APPLICATION_EXECUTABLE}dolphinactionplugin)
+ add_library(${OWNCLOUDDOLPHINACTIONPLUGIN} MODULE 
ownclouddolphinactionplugin.cpp)
+ target_link_libraries(${OWNCLOUDDOLPHINACTIONPLUGIN} KF5::CoreAddons 
KF5::KIOCore KF5::KIOWidgets ${OWNCLOUDDOLPHINHELPER})
+-install(FILES ownclouddolphinactionplugin.desktop DESTINATION 
${KDE_INSTALL_KSERVICES5DIR} RENAME ${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop)
++configure_file(ownclouddolphinactionplugin.desktop.in 
ownclouddolphinactionplugin.desktop ESCAPE_QUOTES @ONLY)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ownclouddolphinactionplugin.desktop 
DESTINATION ${KDE_INSTALL_KSERVICES5DIR} RENAME 
${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop)
+ install(TARGETS ${OWNCLOUDDOLPHINACTIONPLUGIN} DESTINATION 
${KDE_INSTALL_PLUGINDIR})
+--- a/client/shell_integration/dolphin/ownclouddolphinactionplugin.desktop
++++ /dev/null
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Type=Service
+-Name=OwncloudAction
+-ServiceTypes=KFileItemAction/Plugin
+-MimeType=application/octet-stream;inode/directory;
+-X-KDE-Library=ownclouddolphinactionplugin
+--- /dev/null
++++ b/client/shell_integration/dolphin/ownclouddolphinactionplugin.desktop.in
+@@ -0,0 +1,6 @@
++[Desktop Entry]
++Type=Service
++Name=@APPLICATION_NAME@Action
++ServiceTypes=KFileItemAction/Plugin
++MimeType=application/octet-stream;inode/directory;
++X-KDE-Library=@APPLICATION_EXECUTABLE@dolphinactionplugin

diff --git a/net-misc/nextcloud-client/nextcloud-client-2.2.4-r2.ebuild 
b/net-misc/nextcloud-client/nextcloud-client-2.2.4-r2.ebuild
new file mode 100644
index 00000000..1357f90
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.2.4-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Nextcloud themed desktop client"
+HOMEPAGE="https://github.com/nextcloud/client_theming";
+SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
+       https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+       dev-libs/qtkeychain[qt5]
+       dev-qt/qtconcurrent:5
+       dev-qt/qtcore:5
+       dev-qt/qtdbus:5
+       dev-qt/qtgui:5
+       dev-qt/qtnetwork:5
+       dev-qt/qtquickcontrols:5
+       dev-qt/qtsql:5
+       dev-qt/qtwebkit:5[printsupport]
+       sys-fs/inotify-tools
+       virtual/libiconv
+       dolphin? (
+               kde-frameworks/kcoreaddons:5
+               kde-frameworks/kio:5
+       )
+       nautilus? ( dev-python/nautilus-python )
+       samba? ( >=net-fs/samba-3.5 )
+       sftp? ( >=net-libs/libssh-0.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+       !net-misc/ocsync
+       !net-misc/owncloud-client
+"
+DEPEND="${COMMON_DEPEND}
+       dev-qt/linguist-tools:5
+       doc? (
+               dev-python/sphinx
+               dev-texlive/texlive-latexextra
+               virtual/latex-base
+       )
+       dolphin? ( kde-frameworks/extra-cmake-modules )
+       test? (
+               dev-util/cmocka
+               dev-qt/qttest:5
+       )
+"
+
+S=${WORKDIR}/client_theming-${PV}
+
+PATCHES=(
+       "${FILESDIR}"/${P}-dolphin.patch
+)
+src_unpack() {
+       default
+
+       rmdir "${S}"/client || die
+       mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \
+               || die
+}
+
+src_prepare() {
+       CMAKE_USE_DIR="${S}"/client
+       # Keep tests in ${T}
+       sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die
+       # Fix icon name
+       sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \
+               -i client/mirall.desktop.in || die
+
+       if ! use nautilus; then
+               pushd client/shell_integration > /dev/null || die
+               cmake_comment_add_subdirectory nautilus
+               popd > /dev/null || die
+       fi
+
+       default
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+               -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+               -DWITH_ICONV=ON
+               -DWITH_DOC=$(usex doc)
+               -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+               -DBUILD_WITH_QT4=OFF
+               -DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+               -DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+               -DUNIT_TESTING=$(usex test)
+               -DOEM_THEME_DIR="${S}"/nextcloudtheme
+       )
+
+       cmake-utils_src_configure
+}
+
+pkg_postinst() {
+       if ! use doc ; then
+               elog "Documentation and man pages not installed"
+               elog "Enable doc USE-flag to generate them"
+       fi
+}

Reply via email to