From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB828138351 for ; Fri, 24 Apr 2020 15:55:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DAD7DE08C8; Fri, 24 Apr 2020 15:55:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B7906E08C8 for ; Fri, 24 Apr 2020 15:55:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 137F834F113 for ; Fri, 24 Apr 2020 15:55:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 855881EE for ; Fri, 24 Apr 2020 15:55:03 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1587743643.4ffcb9bb27792af73a780430410c03d9a2b6b93e.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch kde-plasma/plasma-desktop/metadata.xml kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r2.ebuild kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ kde-plasma/plasma-desktop/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4ffcb9bb27792af73a780430410c03d9a2b6b93e X-VCS-Branch: master Date: Fri, 24 Apr 2020 15:55:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6c15091b-49ac-4c7b-a32d-5f99eb535450 X-Archives-Hash: 0bf4ac0eb7ba156722a2e870deaaca9b commit: 4ffcb9bb27792af73a780430410c03d9a2b6b93e Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 24 15:53:57 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 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 @@ Build emojipicker applet using app-i18n/ibus and media-fonts/noto-emoji Use ibus input method via app-i18n/ibus Enable applets that use app-i18n/scim - Enable touchpad KCM 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 )