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