commit:     32456f3678e8cdaa43089647b251a084aa4991ea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 08:54:55 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 14 12:06:20 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=32456f36

kde-plasma/plasma-desktop: Rebase override-include-dirs.patch on 5.22

Bump XORGHDRS to override-include-dirs-1.

Upstream commits:
8f2b38aeec93da0c20af3c1ca7dc6c4c75f4c6f1
4a3f69dd34e83654721cb35b02618ff33a14ff11

Closes: https://bugs.gentoo.org/775131
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index a5a5639834..1b319c3632 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -12,7 +12,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
 DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-0"
+XORGHDRS="${PN}-override-include-dirs-1"
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz";
 
 LICENSE="GPL-2" # TODO: CHECK
@@ -143,10 +143,10 @@ src_prepare() {
 src_configure() {
        local mycmakeargs=(
                -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
-               -DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+               -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
                -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
                -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-               -DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+               -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
                $(cmake_use_find_package kaccounts AccountsQt5)
                $(cmake_use_find_package kaccounts KAccounts)
                $(cmake_use_find_package scim SCIM)

Reply via email to