Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/
Date: Wed, 27 Oct 2021 10:21:41
Message-Id: 1635330089.85fa564f558cbf0e69010e5279c124950f3f099f.sam@gentoo
1 commit: 85fa564f558cbf0e69010e5279c124950f3f099f
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 27 10:21:23 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 27 10:21:29 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85fa564f
7
8 kde-plasma/plasma-desktop: add 5.23.2.1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 kde-plasma/plasma-desktop/Manifest | 1 +
13 .../plasma-desktop/plasma-desktop-5.23.2.1.ebuild | 186 +++++++++++++++++++++
14 2 files changed, 187 insertions(+)
15
16 diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
17 index 276134a2595..b7740cd286d 100644
18 --- a/kde-plasma/plasma-desktop/Manifest
19 +++ b/kde-plasma/plasma-desktop/Manifest
20 @@ -1,4 +1,5 @@
21 DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac
22 DIST plasma-desktop-5.23.1.tar.xz 15785208 BLAKE2B 528653f68f1a3e17fc38859d70fe3f985276d2a8cb73b2b5f47f195238221d17ce65e678017ac88ab2f760d2db23b3efbff2c076d2211c8014805e06c1e1852b SHA512 f6f0483e9dc8e64b4def5e723d259ea32ab5b1556d8486a406b3c65e55d5b7d332614ded8c4f651785890067cd6920a497a110905f2cedb9383b254eab8b2505
23 +DIST plasma-desktop-5.23.2.1.tar.xz 15787420 BLAKE2B ca4e55cde0f27f44fb55ecb473c30d4667a9512163d2be61d82bc15fb97aa6aef5459590c2e80e6b6218d1b85e5326a0cb2e5aa5507ea1cfe4eee30561477cf9 SHA512 610b5693e1a56f05c4421c496909960e679035521822c94a180d8ed8656f7995fd9dba5adb92cb18c7c1b4d0c9760b7df5d64fe67e6603538b7ea8a7276ea07d
24 DIST plasma-desktop-5.23.2.tar.xz 15783620 BLAKE2B 5d8445c97eb429186866e44f5737b84037e58a91fc81021b1753c12fb1566f3e0047b1074cd1e0e72b677d3610c65cfca36b80991e2b27834e35845f65112030 SHA512 510c6d98b227c40f004388d18b863aaeed2063f9ca9a9c63bcc4eed7ea665c05e23e82092af86953195e9463bdea77e1121f39a8f0b8a6cf05299a12c477da65
25 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
26
27 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.2.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.2.1.ebuild
28 new file mode 100644
29 index 00000000000..1de5918b598
30 --- /dev/null
31 +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.23.2.1.ebuild
32 @@ -0,0 +1,186 @@
33 +# Copyright 1999-2021 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=8
37 +
38 +ECM_HANDBOOK="forceoptional"
39 +ECM_TEST="true"
40 +KFMIN=5.86.0
41 +PVCUT=$(ver_cut 1-3)
42 +QTMIN=5.15.2
43 +VIRTUALX_REQUIRED="test"
44 +inherit ecm kde.org optfeature
45 +
46 +DESCRIPTION="KDE Plasma desktop"
47 +XORGHDRS="${PN}-override-include-dirs-1"
48 +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
49 +
50 +LICENSE="GPL-2" # TODO: CHECK
51 +SLOT="5"
52 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
53 +IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
54 +
55 +COMMON_DEPEND="
56 + >=dev-qt/qtconcurrent-${QTMIN}:5
57 + >=dev-qt/qtdbus-${QTMIN}:5
58 + >=dev-qt/qtdeclarative-${QTMIN}:5
59 + >=dev-qt/qtgui-${QTMIN}:5
60 + >=dev-qt/qtnetwork-${QTMIN}:5
61 + >=dev-qt/qtprintsupport-${QTMIN}:5
62 + >=dev-qt/qtsql-${QTMIN}:5
63 + >=dev-qt/qtsvg-${QTMIN}:5
64 + >=dev-qt/qtwidgets-${QTMIN}:5
65 + >=dev-qt/qtx11extras-${QTMIN}:5
66 + >=dev-qt/qtxml-${QTMIN}:5
67 + >=kde-frameworks/attica-${KFMIN}:5
68 + >=kde-frameworks/kactivities-${KFMIN}:5
69 + >=kde-frameworks/kactivities-stats-${KFMIN}:5
70 + >=kde-frameworks/karchive-${KFMIN}:5
71 + >=kde-frameworks/kauth-${KFMIN}:5
72 + >=kde-frameworks/kbookmarks-${KFMIN}:5
73 + >=kde-frameworks/kcmutils-${KFMIN}:5
74 + >=kde-frameworks/kcodecs-${KFMIN}:5
75 + >=kde-frameworks/kcompletion-${KFMIN}:5
76 + >=kde-frameworks/kconfig-${KFMIN}:5
77 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5
78 + >=kde-frameworks/kcoreaddons-${KFMIN}:5
79 + >=kde-frameworks/kcrash-${KFMIN}:5
80 + >=kde-frameworks/kdbusaddons-${KFMIN}:5
81 + >=kde-frameworks/kdeclarative-${KFMIN}:5
82 + >=kde-frameworks/kded-${KFMIN}:5
83 + >=kde-frameworks/kdelibs4support-${KFMIN}:5
84 + >=kde-frameworks/kglobalaccel-${KFMIN}:5
85 + >=kde-frameworks/kguiaddons-${KFMIN}:5
86 + >=kde-frameworks/ki18n-${KFMIN}:5
87 + >=kde-frameworks/kiconthemes-${KFMIN}:5
88 + >=kde-frameworks/kio-${KFMIN}:5
89 + >=kde-frameworks/kitemmodels-${KFMIN}:5
90 + >=kde-frameworks/kitemviews-${KFMIN}:5
91 + >=kde-frameworks/kjobwidgets-${KFMIN}:5
92 + >=kde-frameworks/knewstuff-${KFMIN}:5
93 + >=kde-frameworks/knotifications-${KFMIN}:5
94 + >=kde-frameworks/knotifyconfig-${KFMIN}:5
95 + >=kde-frameworks/kparts-${KFMIN}:5
96 + >=kde-frameworks/krunner-${KFMIN}:5
97 + >=kde-frameworks/kservice-${KFMIN}:5
98 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
99 + >=kde-frameworks/kwindowsystem-${KFMIN}:5
100 + >=kde-frameworks/kxmlgui-${KFMIN}:5
101 + >=kde-frameworks/plasma-${KFMIN}:5
102 + >=kde-frameworks/solid-${KFMIN}:5
103 + >=kde-frameworks/sonnet-${KFMIN}:5
104 + >=kde-plasma/kwin-${PVCUT}:5
105 + >=kde-plasma/libksysguard-${PVCUT}:5
106 + >=kde-plasma/libkworkspace-${PVCUT}:5
107 + >=kde-plasma/plasma-workspace-${PVCUT}:5
108 + >=media-libs/phonon-4.11.0
109 + virtual/libcrypt:=
110 + x11-libs/libX11
111 + x11-libs/libXfixes
112 + x11-libs/libXi
113 + x11-libs/libxcb[xkb]
114 + x11-libs/libxkbfile
115 + emoji? (
116 + app-i18n/ibus[emoji]
117 + dev-libs/glib:2
118 + media-fonts/noto-emoji
119 + )
120 + ibus? (
121 + app-i18n/ibus
122 + dev-libs/glib:2
123 + >=dev-qt/qtx11extras-${QTMIN}:5
124 + x11-libs/libxcb
125 + x11-libs/xcb-util-keysyms
126 + )
127 + kaccounts? (
128 + kde-apps/kaccounts-integration:5
129 + net-libs/accounts-qt
130 + )
131 + policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
132 + scim? ( app-i18n/scim )
133 + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
134 + telemetry? ( dev-libs/kuserfeedback:5 )
135 +"
136 +DEPEND="${COMMON_DEPEND}
137 + dev-libs/boost
138 + x11-base/xorg-proto
139 +"
140 +RDEPEND="${COMMON_DEPEND}
141 + !kde-plasma/user-manager
142 + >=dev-qt/qtgraphicaleffects-${QTMIN}:5
143 + >=dev-qt/qtquickcontrols2-${QTMIN}:5
144 + >=kde-frameworks/kirigami-${KFMIN}:5
145 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
146 + >=kde-plasma/kde-cli-tools-${PVCUT}:5
147 + >=kde-plasma/oxygen-${PVCUT}:5
148 + sys-apps/util-linux
149 + x11-apps/setxkbmap
150 + x11-misc/xdg-user-dirs
151 + kaccounts? ( net-libs/signon-oauth2 )
152 + policykit? ( sys-apps/accountsservice )
153 +"
154 +BDEPEND="virtual/pkgconfig"
155 +
156 +PATCHES=(
157 + "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
158 +)
159 +
160 +src_prepare() {
161 + ecm_src_prepare
162 +
163 + if ! use policykit; then
164 + ecm_punt_bogus_dep KF5 Wallet
165 + cmake_run_in kcms cmake_comment_add_subdirectory users
166 + fi
167 +
168 + if ! use ibus; then
169 + sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
170 + -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
171 + fi
172 +
173 + use emoji || cmake_run_in applets/kimpanel/backend/ibus \
174 + cmake_comment_add_subdirectory emojier
175 +
176 + # TODO: try to get a build switch upstreamed
177 + if ! use scim; then
178 + sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
179 + fi
180 +}
181 +
182 +src_configure() {
183 + local mycmakeargs=(
184 + -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
185 + -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
186 + -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
187 + -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
188 + -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
189 + $(cmake_use_find_package kaccounts AccountsQt5)
190 + $(cmake_use_find_package kaccounts KAccounts)
191 + $(cmake_use_find_package semantic-desktop KF5Baloo)
192 + $(cmake_use_find_package telemetry KUserFeedback)
193 + )
194 + if ! use emoji && ! use ibus; then
195 + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
196 + fi
197 +
198 + ecm_src_configure
199 +}
200 +
201 +src_test() {
202 + # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
203 + # test_kio_fonts needs D-Bus, bug #634166
204 + # lookandfeel-kcmTest is unreliable for a long time, bug #607918
205 + local myctestargs=(
206 + -j1
207 + -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
208 + )
209 +
210 + ecm_src_test
211 +}
212 +
213 +pkg_postinst() {
214 + if [[ -z "${REPLACING_VERSIONS}" ]]; then
215 + optfeature "screen reader support" app-accessibility/orca
216 + fi
217 + ecm_pkg_postinst
218 +}