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 6369A1382C5 for ; Fri, 14 May 2021 12:09:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1566DE089A; Fri, 14 May 2021 12:09:06 +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 01D35E089A for ; Fri, 14 May 2021 12:09:06 +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 265AC335D76 for ; Fri, 14 May 2021 12:09:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54F67794 for ; Fri, 14 May 2021 12:09:01 +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: <1620993980.32456f3678e8cdaa43089647b251a084aa4991ea.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 32456f3678e8cdaa43089647b251a084aa4991ea X-VCS-Branch: master Date: Fri, 14 May 2021 12:09:01 +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: c39a8405-aab5-4a90-a161-79adab02e628 X-Archives-Hash: 0b6ceb4f2906a9b27fab3613050a70f4 commit: 32456f3678e8cdaa43089647b251a084aa4991ea Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 14 08:54:55 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 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)