Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
Date: Fri, 24 Apr 2020 15:55:08
Message-Id: 1587743643.4ffcb9bb27792af73a780430410c03d9a2b6b93e.asturm@gentoo
1 commit: 4ffcb9bb27792af73a780430410c03d9a2b6b93e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 24 15:53:57 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 24 15:54:03 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4ffcb9bb
7
8 kde-plasma/plasma-desktop: Pull synaptics/xorg-server headers, drop USE touchpad
9
10 Add patch to FindSynaptics to override include dir. This makes it possible to
11 get rid of xf86-input-synaptics dependency only to build Touchpad KCM.
12
13 Package-Manager: Portage-2.3.99, Repoman-2.3.22
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 ...ma-desktop-5.18.4.1-override-include-dirs.patch | 38 +++++++++++++++++++---
17 kde-plasma/plasma-desktop/metadata.xml | 1 -
18 ...r2.ebuild => plasma-desktop-5.18.4.1-r3.ebuild} | 16 ++++++---
19 .../plasma-desktop-5.18.49.9999.ebuild | 16 ++++++---
20 .../plasma-desktop/plasma-desktop-9999.ebuild | 16 ++++++---
21 5 files changed, 69 insertions(+), 18 deletions(-)
22
23 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
24 index 54b8419e98..4a30d92f3f 100644
25 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
26 +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
27 @@ -1,13 +1,19 @@
28 -From d44a6c8a732c3f82092f3fa3044000f1f8b3a0ec Mon Sep 17 00:00:00 2001
29 +From b11915786a97f55074b7bfe4eec6f3c5cc08ae78 Mon Sep 17 00:00:00 2001
30 From: Andreas Sturmlechner <asturm@g.o>
31 Date: Mon, 6 Apr 2020 00:41:07 +0200
32 -Subject: [PATCH] cmake modules: Allow include dir overrides in FindEvdev,
33 - FindXorgLibinput
34 +Subject: [PATCH] cmake modules: Allow include dir overrides for various input
35 + drivers
36
37 +FindEvdev - evdev-properties.h
38 +FindSynaptics - synaptics-properties.h
39 +FindXorgLibinput - libinput-properties.h
40 +
41 +Hint: Dependency for touchpad (Synaptics): xserver-properties.h (xorg-server)
42 ---
43 cmake/modules/FindEvdev.cmake | 4 ++++
44 + cmake/modules/FindSynaptics.cmake | 4 ++++
45 cmake/modules/FindXorgLibinput.cmake | 4 ++++
46 - 2 files changed, 8 insertions(+)
47 + 3 files changed, 12 insertions(+)
48
49 diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
50 index 153128a90..c19c31a96 100644
51 @@ -31,6 +37,28 @@ index 153128a90..c19c31a96 100644
52 include(FindPackageHandleStandardArgs)
53 find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS)
54
55 +diff --git a/cmake/modules/FindSynaptics.cmake b/cmake/modules/FindSynaptics.cmake
56 +index fb5f9bc3e..eb56965e0 100644
57 +--- a/cmake/modules/FindSynaptics.cmake
58 ++++ b/cmake/modules/FindSynaptics.cmake
59 +@@ -31,6 +31,8 @@
60 + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
61 + # SUCH DAMAGE.
62 +
63 ++if(NOT Synaptics_INCLUDE_DIRS)
64 ++
65 + find_package(PkgConfig)
66 + pkg_check_modules(PC_SYNAPTICS xorg-synaptics)
67 +
68 +@@ -39,6 +41,8 @@ find_path(Synaptics_INCLUDE_DIRS
69 + HINTS ${PC_SYNAPTICS_INCLUDE_DIRS} ${PC_SYNAPTICS_INCLUDEDIR}
70 + )
71 +
72 ++endif()
73 ++
74 + include(FindPackageHandleStandardArgs)
75 + find_package_handle_standard_args(Synaptics REQUIRED_VARS Synaptics_INCLUDE_DIRS)
76 +
77 diff --git a/cmake/modules/FindXorgLibinput.cmake b/cmake/modules/FindXorgLibinput.cmake
78 index 1550751ae..5b7af5e79 100644
79 --- a/cmake/modules/FindXorgLibinput.cmake
80 @@ -54,5 +82,5 @@ index 1550751ae..5b7af5e79 100644
81 find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS)
82
83 --
84 -2.26.0
85 +2.26.2
86
87
88 diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
89 index ad05be8124..49d2b2bec6 100644
90 --- a/kde-plasma/plasma-desktop/metadata.xml
91 +++ b/kde-plasma/plasma-desktop/metadata.xml
92 @@ -9,6 +9,5 @@
93 <flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
94 <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
95 <flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
96 - <flag name="touchpad">Enable touchpad KCM</flag>
97 </use>
98 </pkgmetadata>
99
100 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
101 similarity index 86%
102 rename from kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r2.ebuild
103 rename to kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
104 index b48df34661..6e6fa790ec 100644
105 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r2.ebuild
106 +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
107 @@ -13,19 +13,24 @@ inherit ecm kde.org
108
109 DESCRIPTION="KDE Plasma desktop"
110
111 -# Avoid pulling in xf86-input-{evdev,libinput} DEPEND just for 1 header
112 +# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
113 +# just for 1 header each. touchpad also uses a header from xorg-server.
114 SHA_EVDEV="425ed601"
115 SHA_LIBINPUT="e52daf20"
116 +SHA_SYNAPTICS="383355fa"
117 +SHA_XSERVER="d511a301"
118 XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
119 SRC_URI+="
120 ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
121 ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
122 + ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
123 + ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
124 "
125
126 LICENSE="GPL-2" # TODO: CHECK
127 SLOT="5"
128 KEYWORDS="~amd64"
129 -IUSE="emoji +fontconfig ibus scim +semantic-desktop touchpad"
130 +IUSE="emoji +fontconfig ibus scim +semantic-desktop"
131
132 COMMON_DEPEND="
133 >=dev-qt/qtconcurrent-${QTMIN}:5
134 @@ -110,7 +115,6 @@ COMMON_DEPEND="
135 )
136 scim? ( app-i18n/scim )
137 semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
138 - touchpad? ( x11-drivers/xf86-input-synaptics )
139 "
140 DEPEND="${COMMON_DEPEND}
141 dev-libs/boost
142 @@ -141,6 +145,10 @@ src_unpack() {
143 "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
144 cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
145 "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
146 + cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
147 + "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
148 + cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
149 + "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
150 }
151
152 src_prepare() {
153 @@ -157,9 +165,9 @@ src_configure() {
154 $(cmake_use_find_package fontconfig Fontconfig)
155 -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
156 -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
157 + -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
158 $(cmake_use_find_package scim SCIM)
159 $(cmake_use_find_package semantic-desktop KF5Baloo)
160 - $(cmake_use_find_package touchpad Synaptics)
161 )
162 if ! use emoji && ! use ibus; then
163 mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
164
165 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
166 index 516d269bb9..74192183d6 100644
167 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
168 +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
169 @@ -13,19 +13,24 @@ inherit ecm kde.org
170
171 DESCRIPTION="KDE Plasma desktop"
172
173 -# Avoid pulling in xf86-input-{evdev,libinput} DEPEND just for 1 header
174 +# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
175 +# just for 1 header each. touchpad also uses a header from xorg-server.
176 SHA_EVDEV="425ed601"
177 SHA_LIBINPUT="e52daf20"
178 +SHA_SYNAPTICS="383355fa"
179 +SHA_XSERVER="d511a301"
180 XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
181 SRC_URI+="
182 ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
183 ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
184 + ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
185 + ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
186 "
187
188 LICENSE="GPL-2" # TODO: CHECK
189 SLOT="5"
190 KEYWORDS=""
191 -IUSE="emoji +fontconfig ibus scim +semantic-desktop touchpad"
192 +IUSE="emoji +fontconfig ibus scim +semantic-desktop"
193
194 COMMON_DEPEND="
195 >=dev-qt/qtconcurrent-${QTMIN}:5
196 @@ -110,7 +115,6 @@ COMMON_DEPEND="
197 )
198 scim? ( app-i18n/scim )
199 semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
200 - touchpad? ( x11-drivers/xf86-input-synaptics )
201 "
202 DEPEND="${COMMON_DEPEND}
203 dev-libs/boost
204 @@ -141,6 +145,10 @@ src_unpack() {
205 "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
206 cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
207 "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
208 + cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
209 + "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
210 + cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
211 + "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
212 }
213
214 src_prepare() {
215 @@ -157,9 +165,9 @@ src_configure() {
216 $(cmake_use_find_package fontconfig Fontconfig)
217 -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
218 -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
219 + -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
220 $(cmake_use_find_package scim SCIM)
221 $(cmake_use_find_package semantic-desktop KF5Baloo)
222 - $(cmake_use_find_package touchpad Synaptics)
223 )
224 if ! use emoji && ! use ibus; then
225 mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
226
227 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
228 index fd31f2ac7b..37923f2037 100644
229 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
230 +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
231 @@ -13,19 +13,24 @@ inherit ecm kde.org
232
233 DESCRIPTION="KDE Plasma desktop"
234
235 -# Avoid pulling in xf86-input-{evdev,libinput} DEPEND just for 1 header
236 +# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
237 +# just for 1 header each. touchpad also uses a header from xorg-server.
238 SHA_EVDEV="425ed601"
239 SHA_LIBINPUT="e52daf20"
240 +SHA_SYNAPTICS="383355fa"
241 +SHA_XSERVER="d511a301"
242 XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
243 SRC_URI+="
244 ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
245 ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
246 + ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
247 + ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
248 "
249
250 LICENSE="GPL-2" # TODO: CHECK
251 SLOT="5"
252 KEYWORDS=""
253 -IUSE="emoji +fontconfig ibus scim +semantic-desktop touchpad"
254 +IUSE="emoji +fontconfig ibus scim +semantic-desktop"
255
256 COMMON_DEPEND="
257 >=dev-qt/qtconcurrent-${QTMIN}:5
258 @@ -110,7 +115,6 @@ COMMON_DEPEND="
259 )
260 scim? ( app-i18n/scim )
261 semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
262 - touchpad? ( x11-drivers/xf86-input-synaptics )
263 "
264 DEPEND="${COMMON_DEPEND}
265 dev-libs/boost
266 @@ -141,6 +145,10 @@ src_unpack() {
267 "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
268 cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
269 "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
270 + cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
271 + "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
272 + cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
273 + "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
274 }
275
276 src_prepare() {
277 @@ -157,9 +165,9 @@ src_configure() {
278 $(cmake_use_find_package fontconfig Fontconfig)
279 -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
280 -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
281 + -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
282 $(cmake_use_find_package scim SCIM)
283 $(cmake_use_find_package semantic-desktop KF5Baloo)
284 - $(cmake_use_find_package touchpad Synaptics)
285 )
286 if ! use emoji && ! use ibus; then
287 mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
Report Message
Find on MARC Find on Google Groups