summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-19 20:38:10 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-20 21:10:48 +0200
commit7d118683a717d9a39b2cb72984ae9859dbd2e658 (patch)
treec6015afb19fbad68add0be6c74e019232f75fc5b
parentaefa6c04d99cf1642a405b3d7739c9aa8cc05ed8 (diff)
downloadkde-7d118683a717d9a39b2cb72984ae9859dbd2e658.tar.gz
kde-7d118683a717d9a39b2cb72984ae9859dbd2e658.tar.xz
kdeconnect: Version bump to 1.2
-rw-r--r--packages/app-mobilephone/kdeconnect/kdeconnect-1.2.exheres-0 (renamed from packages/app-mobilephone/kdeconnect/kdeconnect-1.0.3.exheres-0)4
-rw-r--r--packages/app-mobilephone/kdeconnect/kdeconnect.exlib51
2 files changed, 20 insertions, 35 deletions
diff --git a/packages/app-mobilephone/kdeconnect/kdeconnect-1.0.3.exheres-0 b/packages/app-mobilephone/kdeconnect/kdeconnect-1.2.exheres-0
index e4b7699..9adbc9f 100644
--- a/packages/app-mobilephone/kdeconnect/kdeconnect-1.0.3.exheres-0
+++ b/packages/app-mobilephone/kdeconnect/kdeconnect-1.2.exheres-0
@@ -1,11 +1,7 @@
# Copyright 2013 Friedrich Kröner <friedrich@mailstation.de>
# Distributed under the terms of the GNU General Public License v2
-MYPNV="${PN}-kde-${PV}"
-
require kdeconnect
PLATFORMS="~amd64 ~x86"
-DOWNLOADS="mirror://kde/stable/${PN}/$(ever range 1-3)/src/${MYPNV}.tar.xz"
-
diff --git a/packages/app-mobilephone/kdeconnect/kdeconnect.exlib b/packages/app-mobilephone/kdeconnect/kdeconnect.exlib
index b237c18..da9454c 100644
--- a/packages/app-mobilephone/kdeconnect/kdeconnect.exlib
+++ b/packages/app-mobilephone/kdeconnect/kdeconnect.exlib
@@ -4,7 +4,7 @@
MY_PN="${PN}-kde"
-require kde.org kde test-dbus-daemon
+require kde.org [ subdir=${PN}/${PV}/src ] kde test-dbus-daemon
require freedesktop-desktop gtk-icon-cache
export_exlib_phases src_prepare src_test pkg_postinst pkg_postrm
@@ -28,16 +28,12 @@ HOMEPAGE="https://albertvaka.wordpress.com/
LICENCES="GPL-2 || ( GPL-2 GPL-3 )"
SLOT="0"
MYOPTIONS="
+ bluetooth [[ description = [ Use kdeconnect with bluetooth connected devices ] ]]
+ experimental-app [[ description = [ Build an experimental app, based on Kirigami ] ]]
wayland [[ description = [ Integrate with KWayland for fake input support ] ]]
"
-if ever at_least scm ; then
- MYOPTIONS+="
- experimental-app [[ description = [ Build an experimental app, based on Kirigami ] ]]
- "
-fi
-
-KF5_MIN_VER="5.9"
+KF5_MIN_VER="5.38"
DEPENDENCIES="
build:
@@ -47,15 +43,15 @@ DEPENDENCIES="
build+run:
app-crypt/qca:2[>=2.1.0][qt5(-)] [[ note = [ library and qca-ossl plugin ] ]]
kde-frameworks/kcmutils:5[>=${KF5_MIN_VER}]
- kde-frameworks/kconfig:5
- kde-frameworks/kconfigwidgets:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kdbusaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kiconthemes:5
- kde-frameworks/kio:5
+ kde-frameworks/kconfig:5[>=${KF5_MIN_VER}]
+ kde-frameworks/kconfigwidgets:5[>=${KF5_MIN_VER}]
+ kde-frameworks/kcoreaddons:5[>=${KF5_MIN_VER}]
+ kde-frameworks/kdbusaddons:5[>=${KF5_MIN_VER}]
+ kde-frameworks/ki18n:5[>=${KF5_MIN_VER}]
+ kde-frameworks/kiconthemes:5[>=${KF5_MIN_VER}]
+ kde-frameworks/kio:5[>=${KF5_MIN_VER}]
kde-frameworks/knotifications:5[>=${KF5_MIN_VER}]
- kde-frameworks/kservice:5
+ kde-frameworks/kservice:5[>=${KF5_MIN_VER}]
media-libs/phonon[qt5(-)]
sys-apps/dbus
x11-libs/libfakekey
@@ -64,7 +60,11 @@ DEPENDENCIES="
x11-libs/qtbase:5[>=5.2.0]
x11-libs/qtdeclarative:5[>=5.2.0]
x11-libs/qtx11extras:5[>=5.2.0]
+ bluetooth? ( x11-libs/qtconnectivity:5 )
+ experimental-app? ( kde-frameworks/kdeclarative:5 )
wayland? ( kde-frameworks/kwayland:5[>=5.3.90] )
+ run:
+ experimental-app? ( kde-frameworks/kirigami:2 )
recommendation:
sys-fs/sshfs-fuse [[
description = [ Browse the file system on your mobile device remotely ]
@@ -84,21 +84,10 @@ BUGS_TO="friedrich@mailstation.de heirecka@exherbo.org"
DEFAULT_SRC_PREPARE_PATCHES+=( "${FILES}"/${PN}-tests-Use-QT_GUILESS_MAIN.patch )
-if ever at_least scm ; then
- DEPENDENCIES+="
- build+run:
- experimental-app? ( kde-frameworks/kdeclarative:5 )
- run:
- experimental-app? ( kde-frameworks/kirigami:2 )
- "
-
- CMAKE_SRC_CONFIGURE_OPTIONS+=(
- 'experimental-app EXPERIMENTALAPP_ENABLED'
- )
-else
- CMAKE_SRC_CONFIGURE_PARAMS+=( -DEXPERIMENTALAPP_ENABLED:BOOL=FALSE )
-fi
-
+CMAKE_SRC_CONFIGURE_OPTIONS+=(
+ 'bluetooth BLUETOOTH_ENABLED'
+ 'experimental-app EXPERIMENTALAPP_ENABLED'
+)
CMAKE_SRC_CONFIGURE_OPTION_DISABLE_FINDS+=(
'wayland KF5Wayland'
)