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