Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/files/, kde-plasma/kdeplasma-addons/
Date: Tue, 23 Nov 2021 14:59:40
Message-Id: 1637679551.6c44f9ca36f524f51bfa1fe3bc891c62dc75fb46.asturm@gentoo
1 commit: 6c44f9ca36f524f51bfa1fe3bc891c62dc75fb46
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 15 15:03:27 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 23 14:59:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c44f9ca
7
8 kde-plasma/kdeplasma-addons: mediaframe: fix path URLs
9
10 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=445071
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 ...ma-addons-5.23.3-mediaframe-fix-path-URLs.patch | 31 +++++++++
15 .../kdeplasma-addons-5.23.3-r1.ebuild | 75 ++++++++++++++++++++++
16 2 files changed, 106 insertions(+)
17
18 diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-mediaframe-fix-path-URLs.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-mediaframe-fix-path-URLs.patch
19 new file mode 100644
20 index 000000000000..55fed8152434
21 --- /dev/null
22 +++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-mediaframe-fix-path-URLs.patch
23 @@ -0,0 +1,31 @@
24 +From 5e16b5ab644748fbf38c2b7fa7113d8dc99bcc28 Mon Sep 17 00:00:00 2001
25 +From: Patrick Northon <northon_patrick3@×××××.ca>
26 +Date: Sun, 7 Nov 2021 20:36:45 -0500
27 +Subject: [PATCH] [mediaframe] Make files added from paths into URLs.
28 +
29 +This make it consistent with individual files added and fix a problem where the url isn't converted to a path properly in some conditions when the url doesn't contain the schema (file://).
30 +
31 +BUG: 445071
32 +
33 +
34 +(cherry picked from commit 181cc49c4d44a4ac926051ebf9a53d0a8fc6b253)
35 +---
36 + applets/mediaframe/plugin/mediaframe.cpp | 2 +-
37 + 1 file changed, 1 insertion(+), 1 deletion(-)
38 +
39 +diff --git a/applets/mediaframe/plugin/mediaframe.cpp b/applets/mediaframe/plugin/mediaframe.cpp
40 +index 45e37eeae..8729d7b83 100644
41 +--- a/applets/mediaframe/plugin/mediaframe.cpp
42 ++++ b/applets/mediaframe/plugin/mediaframe.cpp
43 +@@ -125,7 +125,7 @@ void MediaFrame::add(const QString &path, AddOption option)
44 + while (dirIterator.hasNext()) {
45 + dirIterator.next();
46 +
47 +- filePath = dirIterator.filePath();
48 ++ filePath = "file://" + dirIterator.filePath();
49 + paths.append(filePath);
50 + m_allFiles.append(filePath);
51 + // qDebug() << "Appended" << filePath;
52 +--
53 +GitLab
54 +
55
56 diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.3-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.3-r1.ebuild
57 new file mode 100644
58 index 000000000000..73d939f3bafb
59 --- /dev/null
60 +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.3-r1.ebuild
61 @@ -0,0 +1,75 @@
62 +# Copyright 1999-2021 Gentoo Authors
63 +# Distributed under the terms of the GNU General Public License v2
64 +
65 +EAPI=8
66 +
67 +ECM_HANDBOOK="forceoptional"
68 +KFMIN=5.86.0
69 +PVCUT=$(ver_cut 1-3)
70 +QTMIN=5.15.2
71 +VIRTUALX_REQUIRED="test"
72 +inherit ecm kde.org optfeature
73 +
74 +DESCRIPTION="Extra Plasma applets and engines"
75 +
76 +LICENSE="GPL-2 LGPL-2"
77 +SLOT="5"
78 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
79 +IUSE="share webengine"
80 +
81 +RESTRICT="test" # bug 727846
82 +
83 +DEPEND="
84 + >=dev-qt/qtdbus-${QTMIN}:5
85 + >=dev-qt/qtdeclarative-${QTMIN}:5
86 + >=dev-qt/qtgui-${QTMIN}:5
87 + >=dev-qt/qtwidgets-${QTMIN}:5
88 + >=kde-frameworks/karchive-${KFMIN}:5
89 + >=kde-frameworks/kcmutils-${KFMIN}:5
90 + >=kde-frameworks/kcompletion-${KFMIN}:5
91 + >=kde-frameworks/kconfig-${KFMIN}:5
92 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5
93 + >=kde-frameworks/kcoreaddons-${KFMIN}:5
94 + >=kde-frameworks/kdeclarative-${KFMIN}:5
95 + >=kde-frameworks/kholidays-${KFMIN}:5
96 + >=kde-frameworks/ki18n-${KFMIN}:5
97 + >=kde-frameworks/kio-${KFMIN}:5
98 + >=kde-frameworks/knewstuff-${KFMIN}:5
99 + >=kde-frameworks/knotifications-${KFMIN}:5
100 + >=kde-frameworks/kpackage-${KFMIN}:5
101 + >=kde-frameworks/krunner-${KFMIN}:5
102 + >=kde-frameworks/kservice-${KFMIN}:5
103 + >=kde-frameworks/kunitconversion-${KFMIN}:5
104 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
105 + >=kde-frameworks/kwindowsystem-${KFMIN}:5
106 + >=kde-frameworks/kxmlgui-${KFMIN}:5
107 + >=kde-frameworks/plasma-${KFMIN}:5
108 + >=kde-frameworks/sonnet-${KFMIN}:5
109 + share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
110 + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
111 +"
112 +RDEPEND="${DEPEND}
113 + >=dev-qt/qtquickcontrols-${QTMIN}:5
114 + >=dev-qt/qtquickcontrols2-${QTMIN}:5
115 + >=kde-plasma/plasma-workspace-${PVCUT}:5
116 +"
117 +
118 +PATCHES=(
119 + "${FILESDIR}"/${P}-mediaframe-fix-path-URLs.patch
120 +)
121 +
122 +src_configure() {
123 + local mycmakeargs=(
124 + $(cmake_use_find_package share KF5Purpose)
125 + $(cmake_use_find_package webengine Qt5WebEngine)
126 + )
127 +
128 + ecm_src_configure
129 +}
130 +
131 +pkg_postinst() {
132 + if [[ -z "${REPLACING_VERSIONS}" ]]; then
133 + optfeature "Disk quota applet" sys-fs/quota
134 + fi
135 + ecm_pkg_postinst
136 +}