[gentoo-commits] proj/kde:master commit in: kde-misc/kdeconnect/, kde-misc/kdeconnect/files/
commit: 9ae64903ffdcd696129fc4af20f585fb882047ab
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 23 10:54:52 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 23 10:57:23 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9ae64903
kde-misc/kdeconnect: Add IUSE telephony
Upstream commits:
7b1f10d4d514285017928b79316ff5e061f16e86
97e47efdf6626fa0ae282684ab50ee6fce67d642
Bug: https://bugs.gentoo.org/904823
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../kdeconnect-23.04.0-telephony-optional.patch| 40 ++
.../kdeconnect/kdeconnect-23.04.49..ebuild | 11 --
kde-misc/kdeconnect/kdeconnect-.ebuild | 6 ++--
kde-misc/kdeconnect/metadata.xml | 1 +
4 files changed, 53 insertions(+), 5 deletions(-)
diff --git
a/kde-misc/kdeconnect/files/kdeconnect-23.04.0-telephony-optional.patch
b/kde-misc/kdeconnect/files/kdeconnect-23.04.0-telephony-optional.patch
new file mode 100644
index 00..bec66fd645
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-23.04.0-telephony-optional.patch
@@ -0,0 +1,40 @@
+From 97e47efdf6626fa0ae282684ab50ee6fce67d642 Mon Sep 17 00:00:00 2001
+From: Heiko Becker
+Date: Mon, 20 Mar 2023 20:33:11 +0100
+Subject: [PATCH] Make mmtelephony plugin optional
+
+I see little purpose in pulling that stack in on a desktop computer,
+which doesn't even have a modem.
+---
+ plugins/CMakeLists.txt | 5 -
+ plugins/mmtelephony/CMakeLists.txt | 1 -
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index dda19398b..1e304b88e 100644
+--- a/plugins/CMakeLists.txt
b/plugins/CMakeLists.txt
+@@ -39,7 +39,10 @@ if(NOT SAILFISHOS)
+ add_subdirectory(virtualmonitor)
+
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+- add_subdirectory(mmtelephony)
++find_package(KF5ModemManagerQt ${KF5_MIN_VERSION})
++if (TARGET KF5::ModemManagerQt)
++add_subdirectory(mmtelephony)
++endif()
+ endif()
+
+ if(NOT WIN32)
+diff --git a/plugins/mmtelephony/CMakeLists.txt
b/plugins/mmtelephony/CMakeLists.txt
+index 1fd9afe1e..c792b4c7c 100644
+--- a/plugins/mmtelephony/CMakeLists.txt
b/plugins/mmtelephony/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS ModemManagerQt)
+ set(debug_file_SRCS)
+ ecm_qt_declare_logging_category(
+ debug_file_SRCS HEADER plugin_mmtelephony_debug.h
+--
+GitLab
+
diff --git a/kde-misc/kdeconnect/kdeconnect-23.04.49..ebuild
b/kde-misc/kdeconnect/kdeconnect-23.04.49..ebuild
index ebc5a9f396..af65e0957d 100644
--- a/kde-misc/kdeconnect/kdeconnect-23.04.49..ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-23.04.49..ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kdeconnect.kde.org/
https://apps.kde.org/kdeconnect/;
LICENSE="GPL-2+"
SLOT="5"
KEYWORDS=""
-IUSE="bluetooth pulseaudio X"
+IUSE="bluetooth pulseaudio telephony X"
RESTRICT="test"
@@ -53,12 +53,13 @@ DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
x11-libs/libxkbcommon
bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 )
+ pulseaudio? ( media-libs/pulseaudio-qt:= )
+ telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:5 )
X? (
x11-libs/libfakekey
x11-libs/libX11
x11-libs/libXtst
)
- pulseaudio? ( media-libs/pulseaudio-qt:= )
"
RDEPEND="${DEPEND}
dev-libs/kpeoplevcard
@@ -72,12 +73,16 @@ BDEPEND="
dev-util/wayland-scanner
"
-PATCHES=( "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch"
+ "${FILESDIR}/${PN}-23.04.0-telephony-optional.patch" # bug 904823
+)
src_configure() {
local mycmakeargs=(
-DBLUETOOTH_ENABLED=$(usex bluetooth)
$(cmake_use_find_package pulseaudio KF5PulseAudioQt)
+ $(cmake_use_find_package telephony KF5ModemManagerQt)
$(cmake_use_find_package X LibFakeKey)
)
ecm_src_configure
diff --git a/kde-misc/kdeconnect/kdeconnect-.ebuild
b/kde-misc/kdeconnect/kdeconnect-.ebuild
index ebc5a9f396..ffe7acb245 100644
--- a/kde-misc/kdeconnect/kdeconnect-.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kdeconnect.kde.org/
https://apps.kde.org/kdeconnect/;
LICENSE="GPL-2+"
SLOT="5"
KEYWORDS=""
-IUSE="bluetooth pulseaudio X"
+IUSE="bluetooth pulseaudio telephony X"
RESTRICT="test"
@@ -53,12 +53,13 @@ DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
x11-libs/libxkbcommon
bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 )
+ pulseaudio? ( media-libs/pulseaudio-qt:= )
+ telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:5 )
X? (
x11-libs/libfakekey
x11-libs/libX11
[gentoo-commits] proj/kde:master commit in: kde-misc/kdeconnect/, kde-misc/kdeconnect/files/
commit: 2e7baea700bac009a9cc0887c0fd596473517604
Author: Johannes Huber gentoo org>
AuthorDate: Tue Apr 10 18:38:33 2018 +
Commit: Johannes Huber gentoo org>
CommitDate: Tue Apr 10 18:41:14 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e7baea7
kde-misc/kdeconnect: Fix build w/o wayland/handbook
Reported-by: email200202 yahoo.com
Thanks-to: Andreas Sturmlechner gentoo.org>
Bug: https://bugs.gentoo.org/652888
Package-Manager: Portage-2.3.28, Repoman-2.3.9
kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch | 11 +++
kde-misc/kdeconnect/kdeconnect-.ebuild | 8 +---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch
b/kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch
new file mode 100644
index 00..7b34659502
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch
@@ -0,0 +1,11 @@
+diff --git a/plugins/mousepad/CMakeLists.txt b/plugins/mousepad/CMakeLists.txt
+index 7f14139e..a1daaa16 100644
+--- a/plugins/mousepad/CMakeLists.txt
b/plugins/mousepad/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ if(UNIX)
+-find_package(KF5 ${KF5_MIN_VERSION} QUIET COMPONENTS Wayland)
++find_package(KF5Wayland ${KF5_MIN_VERSION} QUIET)
+
+ find_package(LibFakeKey QUIET)
+ set_package_properties(LibFakeKey PROPERTIES DESCRIPTION "fake key events"
diff --git a/kde-misc/kdeconnect/kdeconnect-.ebuild
b/kde-misc/kdeconnect/kdeconnect-.ebuild
index bfb57f864e..fb8b9ec947 100644
--- a/kde-misc/kdeconnect/kdeconnect-.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="forceoptional"
KDE_TEST="true"
KMNAME="${PN}-kde"
KDE_SELINUX_MODULE="${PN}"
@@ -54,12 +54,14 @@ RDEPEND="${DEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${PN}-1.3.1-no-wayland.patch" )
+
src_prepare() {
+ kde5_src_prepare
+
sed \
-e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
-i daemon/kdeconnectd.desktop.cmake || die
-
- kde5_src_prepare
}
src_configure() {
[gentoo-commits] proj/kde:master commit in: kde-misc/kdeconnect/, kde-misc/kdeconnect/files/
commit: 2a80389541cdc3e1ed3c8ce9eea04bd17b7a2acd
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Mon Mar 16 19:11:05 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Mar 16 19:11:05 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a803895
[kde-misc/kdeconnect] Remove failing patch
Should be handled by eclass.
Package-Manager: portage-2.2.18
.../files/kdeconnect--tests-optional.patch | 26 --
kde-misc/kdeconnect/kdeconnect-.ebuild | 2 --
2 files changed, 28 deletions(-)
diff --git a/kde-misc/kdeconnect/files/kdeconnect--tests-optional.patch
b/kde-misc/kdeconnect/files/kdeconnect--tests-optional.patch
deleted file mode 100644
index 8ebc0bd..000
--- a/kde-misc/kdeconnect/files/kdeconnect--tests-optional.patch
+++ /dev/null
@@ -1,26 +0,0 @@
a/CMakeLists.txt 2015-01-21 01:15:05.438460864 +0100
-+++ b/CMakeLists.txt 2015-01-21 01:17:08.896283297 +0100
-@@ -2,10 +2,11 @@
-
- cmake_minimum_required(VERSION 2.8.12)
-
-+set(QT_MIN_VERSION 5.2.0)
- find_package(ECM 0.0.9 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}
${CMAKE_SOURCE_DIR}/cmake)
-
--find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test)
-+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Quick)
- find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets
DBusAddons KCMUtils IconThemes)
- find_package(Qca-qt5 2.1.0 REQUIRED)
-
-@@ -32,6 +33,9 @@
- add_subdirectory(cli)
- add_subdirectory(fileitemactionplugin)
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED)
-+add_subdirectory(tests)
-+endif()
-
- install(PROGRAMS kdeconnect-non-plasma.desktop DESTINATION
${XDG_APPS_INSTALL_DIR})
diff --git a/kde-misc/kdeconnect/kdeconnect-.ebuild
b/kde-misc/kdeconnect/kdeconnect-.ebuild
index aec86fe..cd77d8b 100644
--- a/kde-misc/kdeconnect/kdeconnect-.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-.ebuild
@@ -25,8 +25,6 @@ RDEPEND=${DEPEND}
$(add_plasma_dep plasma-workspace)
-PATCHES=( ${FILESDIR}/${PN}--tests-optional.patch )
-
[[ ${KDE_BUILD_TYPE} != live ]] S=${WORKDIR}/${MY_P}
pkg_postinst(){
