commit: 4ffcb9bb27792af73a780430410c03d9a2b6b93e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 15:53:57 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 15:54:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4ffcb9bb
kde-plasma/plasma-desktop: Pull synaptics/xorg-server headers, drop USE touchpad
Add patch to FindSynaptics to override include dir. This makes it possible to
get rid of xf86-input-synaptics dependency only to build Touchpad KCM.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ma-desktop-5.18.4.1-override-include-dirs.patch | 38 +++++++++++++++++++---
kde-plasma/plasma-desktop/metadata.xml | 1 -
...r2.ebuild => plasma-desktop-5.18.4.1-r3.ebuild} | 16 ++++++---
.../plasma-desktop-5.18.49.9999.ebuild | 16 ++++++---
.../plasma-desktop/plasma-desktop-9999.ebuild | 16 ++++++---
5 files changed, 69 insertions(+), 18 deletions(-)
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
index 54b8419e98..4a30d92f3f 100644
---
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
@@ -1,13 +1,19 @@
-From d44a6c8a732c3f82092f3fa3044000f1f8b3a0ec Mon Sep 17 00:00:00 2001
+From b11915786a97f55074b7bfe4eec6f3c5cc08ae78 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <ast...@gentoo.org>
Date: Mon, 6 Apr 2020 00:41:07 +0200
-Subject: [PATCH] cmake modules: Allow include dir overrides in FindEvdev,
- FindXorgLibinput
+Subject: [PATCH] cmake modules: Allow include dir overrides for various input
+ drivers
+FindEvdev - evdev-properties.h
+FindSynaptics - synaptics-properties.h
+FindXorgLibinput - libinput-properties.h
+
+Hint: Dependency for touchpad (Synaptics): xserver-properties.h (xorg-server)
---
cmake/modules/FindEvdev.cmake | 4 ++++
+ cmake/modules/FindSynaptics.cmake | 4 ++++
cmake/modules/FindXorgLibinput.cmake | 4 ++++
- 2 files changed, 8 insertions(+)
+ 3 files changed, 12 insertions(+)
diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
index 153128a90..c19c31a96 100644
@@ -31,6 +37,28 @@ index 153128a90..c19c31a96 100644
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS)
+diff --git a/cmake/modules/FindSynaptics.cmake
b/cmake/modules/FindSynaptics.cmake
+index fb5f9bc3e..eb56965e0 100644
+--- a/cmake/modules/FindSynaptics.cmake
++++ b/cmake/modules/FindSynaptics.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+
++if(NOT Synaptics_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_SYNAPTICS xorg-synaptics)
+
+@@ -39,6 +41,8 @@ find_path(Synaptics_INCLUDE_DIRS
+ HINTS ${PC_SYNAPTICS_INCLUDE_DIRS} ${PC_SYNAPTICS_INCLUDEDIR}
+ )
+
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Synaptics REQUIRED_VARS
Synaptics_INCLUDE_DIRS)
+
diff --git a/cmake/modules/FindXorgLibinput.cmake
b/cmake/modules/FindXorgLibinput.cmake
index 1550751ae..5b7af5e79 100644
--- a/cmake/modules/FindXorgLibinput.cmake
@@ -54,5 +82,5 @@ index 1550751ae..5b7af5e79 100644
find_package_handle_standard_args(XorgLibinput REQUIRED_VARS
XORGLIBINPUT_INCLUDE_DIRS)
--
-2.26.0
+2.26.2
diff --git a/kde-plasma/plasma-desktop/metadata.xml
b/kde-plasma/plasma-desktop/metadata.xml
index ad05be8124..49d2b2bec6 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -9,6 +9,5 @@
<flag name="emoji">Build emojipicker applet using
<pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
<flag name="ibus">Use ibus input method via
<pkg>app-i18n/ibus</pkg></flag>
<flag name="scim">Enable applets that use
<pkg>app-i18n/scim</pkg></flag>
- <flag name="touchpad">Enable touchpad KCM</flag>
</use>
</pkgmetadata>
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
similarity index 86%
rename from kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r2.ebuild
rename to kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
index b48df34661..6e6fa790ec 100644
--- 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
@@ -13,19 +13,24 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
-# Avoid pulling in xf86-input-{evdev,libinput} DEPEND just for 1 header
+# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
+# just for 1 header each. touchpad also uses a header from xorg-server.
SHA_EVDEV="425ed601"
SHA_LIBINPUT="e52daf20"
+SHA_SYNAPTICS="383355fa"
+SHA_XSERVER="d511a301"
XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw";
SRC_URI+="
${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h ->
evdev-properties.h-${SHA_EVDEV}
${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h
-> libinput-properties.h-${SHA_LIBINPUT}
+
${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h
-> synaptics-properties.h-${SHA_SYNAPTICS}
+
${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h ->
xserver-properties.h-${SHA_XSERVER}
"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS="~amd64"
-IUSE="emoji +fontconfig ibus scim +semantic-desktop touchpad"
+IUSE="emoji +fontconfig ibus scim +semantic-desktop"
COMMON_DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -110,7 +115,6 @@ COMMON_DEPEND="
)
scim? ( app-i18n/scim )
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- touchpad? ( x11-drivers/xf86-input-synaptics )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -141,6 +145,10 @@ src_unpack() {
"${WORKDIR}"/include/evdev-properties.h || die "Failed to copy
evdev"
cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
"${WORKDIR}"/include/libinput-properties.h || die "Failed to
copy libinput"
+ cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
+ "${WORKDIR}"/include/synaptics-properties.h || die "Failed to
copy synaptics"
+ cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
+ "${WORKDIR}"/include/xserver-properties.h || die "Failed to
copy xserver"
}
src_prepare() {
@@ -157,9 +165,9 @@ src_configure() {
$(cmake_use_find_package fontconfig Fontconfig)
-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package touchpad Synaptics)
)
if ! use emoji && ! use ibus; then
mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
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
index 516d269bb9..74192183d6 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
@@ -13,19 +13,24 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
-# Avoid pulling in xf86-input-{evdev,libinput} DEPEND just for 1 header
+# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
+# just for 1 header each. touchpad also uses a header from xorg-server.
SHA_EVDEV="425ed601"
SHA_LIBINPUT="e52daf20"
+SHA_SYNAPTICS="383355fa"
+SHA_XSERVER="d511a301"
XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw";
SRC_URI+="
${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h ->
evdev-properties.h-${SHA_EVDEV}
${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h
-> libinput-properties.h-${SHA_LIBINPUT}
+
${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h
-> synaptics-properties.h-${SHA_SYNAPTICS}
+
${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h ->
xserver-properties.h-${SHA_XSERVER}
"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-IUSE="emoji +fontconfig ibus scim +semantic-desktop touchpad"
+IUSE="emoji +fontconfig ibus scim +semantic-desktop"
COMMON_DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -110,7 +115,6 @@ COMMON_DEPEND="
)
scim? ( app-i18n/scim )
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- touchpad? ( x11-drivers/xf86-input-synaptics )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -141,6 +145,10 @@ src_unpack() {
"${WORKDIR}"/include/evdev-properties.h || die "Failed to copy
evdev"
cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
"${WORKDIR}"/include/libinput-properties.h || die "Failed to
copy libinput"
+ cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
+ "${WORKDIR}"/include/synaptics-properties.h || die "Failed to
copy synaptics"
+ cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
+ "${WORKDIR}"/include/xserver-properties.h || die "Failed to
copy xserver"
}
src_prepare() {
@@ -157,9 +165,9 @@ src_configure() {
$(cmake_use_find_package fontconfig Fontconfig)
-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package touchpad Synaptics)
)
if ! use emoji && ! use ibus; then
mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index fd31f2ac7b..37923f2037 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -13,19 +13,24 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
-# Avoid pulling in xf86-input-{evdev,libinput} DEPEND just for 1 header
+# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
+# just for 1 header each. touchpad also uses a header from xorg-server.
SHA_EVDEV="425ed601"
SHA_LIBINPUT="e52daf20"
+SHA_SYNAPTICS="383355fa"
+SHA_XSERVER="d511a301"
XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw";
SRC_URI+="
${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h ->
evdev-properties.h-${SHA_EVDEV}
${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h
-> libinput-properties.h-${SHA_LIBINPUT}
+
${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h
-> synaptics-properties.h-${SHA_SYNAPTICS}
+
${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h ->
xserver-properties.h-${SHA_XSERVER}
"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-IUSE="emoji +fontconfig ibus scim +semantic-desktop touchpad"
+IUSE="emoji +fontconfig ibus scim +semantic-desktop"
COMMON_DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -110,7 +115,6 @@ COMMON_DEPEND="
)
scim? ( app-i18n/scim )
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- touchpad? ( x11-drivers/xf86-input-synaptics )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -141,6 +145,10 @@ src_unpack() {
"${WORKDIR}"/include/evdev-properties.h || die "Failed to copy
evdev"
cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
"${WORKDIR}"/include/libinput-properties.h || die "Failed to
copy libinput"
+ cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
+ "${WORKDIR}"/include/synaptics-properties.h || die "Failed to
copy synaptics"
+ cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
+ "${WORKDIR}"/include/xserver-properties.h || die "Failed to
copy xserver"
}
src_prepare() {
@@ -157,9 +165,9 @@ src_configure() {
$(cmake_use_find_package fontconfig Fontconfig)
-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package touchpad Synaptics)
)
if ! use emoji && ! use ibus; then
mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
