From 2ed9b8f4bd6dcb9ae88c6d3dcd63f4ff5861d18c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 16 Oct 2021 23:32:46 +0200 Subject: kde-apps/kio-extras: Fix kio-mtp with >=media-libs/libmtp-1.1.19 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner --- .../files/kio-extras-21.04.3-libmtp-0.1.19.patch | 26 ++++++ kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild | 102 +++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch create mode 100644 kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild diff --git a/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch b/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch new file mode 100644 index 000000000000..400fdd859652 --- /dev/null +++ b/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch @@ -0,0 +1,26 @@ +From a6ecc8855a0a2a8f76234f77422940b863960944 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Sat, 2 Oct 2021 12:53:27 +0200 +Subject: [PATCH] Fix kio-mtp with libmtp 1.1.19 + +In libmtp 1.1.19, an empty string is returned instead of NULL for devices without a deviceName, which breaks accessing those devices with kio-mtp +--- + mtp/kiod_module/mtpdevice.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mtp/kiod_module/mtpdevice.cpp b/mtp/kiod_module/mtpdevice.cpp +index 8fe4abb2..f32cd1a4 100644 +--- a/mtp/kiod_module/mtpdevice.cpp ++++ b/mtp/kiod_module/mtpdevice.cpp +@@ -40,7 +40,7 @@ MTPDevice::MTPDevice(const QString &dbusObjectPath, LIBMTP_mtpdevice_t *device, + const char *deviceModel = LIBMTP_Get_Modelname(device); + + // prefer friendly devicename over model +- if (!deviceName) { ++ if (!deviceName || strlen(deviceName) == 0) { + m_friendlyName = QString::fromUtf8(deviceModel); + } else { + m_friendlyName = QString::fromUtf8(deviceName); +-- +GitLab + diff --git a/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild b/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild new file mode 100644 index 000000000000..8814d0c4cb61 --- /dev/null +++ b/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="optional" +KFMIN=5.80.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data" +HOMEPAGE="https://invent.kde.org/network/kio-extras" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X" + +# requires running Plasma environment +RESTRICT+=" test" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdnssd-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=kde-frameworks/syntax-highlighting-${KFMIN}:5 + activities? ( + >=dev-qt/qtsql-${QTMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/kactivities-stats-${KFMIN}:5 + ) + mtp? ( >=media-libs/libmtp-1.1.16:= ) + nfs? ( net-libs/libtirpc:= ) + openexr? ( media-libs/openexr:* ) + phonon? ( >=media-libs/phonon-4.11.0 ) + samba? ( + net-fs/samba[client] + net-libs/kdsoap:= + net-libs/kdsoap-ws-discovery-client + ) + sftp? ( net-libs/libssh:=[sftp] ) + taglib? ( >=media-libs/taglib-1.11.1 ) + X? ( + x11-libs/libX11 + x11-libs/libXcursor + ) +" +RDEPEND="${DEPEND} + >=kde-frameworks/kded-${KFMIN}:5 +" +BDEPEND="man? ( dev-util/gperf )" + +PATCHES=( + "${FILESDIR}"/${P}-libmtp-0.1.19.patch +) + +src_prepare() { + ecm_src_prepare + cmake_comment_add_subdirectory network +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package activities KF5Activities) + $(cmake_use_find_package activities KF5ActivitiesStats) + $(cmake_use_find_package activities Qt5Sql) + $(cmake_use_find_package man Gperf) + $(cmake_use_find_package mtp Mtp) + $(cmake_use_find_package nfs TIRPC) + $(cmake_use_find_package openexr OpenEXR) + $(cmake_use_find_package phonon Phonon4Qt5) + $(cmake_use_find_package samba Samba) + $(cmake_use_find_package sftp libssh) + $(cmake_use_find_package taglib Taglib) + $(cmake_use_find_package X X11) + ) + use samba && mycmakeargs+=( + -DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff + ) + + ecm_src_configure +} -- cgit v1.2.3-65-gdbad