commit: 33d7abaf3de642b84fa915586a8afd8e38ae08d6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 7 19:48:19 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 7 19:52:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=33d7abaf
kde-plasma/plasma-desktop: Update override-include-dirs.patch
...to cover new FindXorgServer.cmake module.
Upstream commit 82e7a6b68d81ca2be0fdc3fc13cd5ca5f5e03e81
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...sma-desktop-5.18.5-override-include-dirs.patch} | 35 ++++++++++++++++++----
.../plasma-desktop/plasma-desktop-9999.ebuild | 3 +-
2 files changed, 31 insertions(+), 7 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.5-override-include-dirs.patch
similarity index 71%
rename from
kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
rename to
kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
index 3118913e08..ffbf2b6442 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.5-override-include-dirs.patch
@@ -1,19 +1,19 @@
-From b11915786a97f55074b7bfe4eec6f3c5cc08ae78 Mon Sep 17 00:00:00 2001
+From 6971b5eac2088d263527b2b4a85bb08b1a2dc792 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <ast...@gentoo.org>
Date: Mon, 6 Apr 2020 00:41:07 +0200
-Subject: [PATCH 1/2] cmake modules: Allow include dir overrides for various
- input drivers
+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)
+FindXorgServer - xserver-properties.h
---
cmake/modules/FindEvdev.cmake | 4 ++++
cmake/modules/FindSynaptics.cmake | 4 ++++
cmake/modules/FindXorgLibinput.cmake | 4 ++++
- 3 files changed, 12 insertions(+)
+ cmake/modules/FindXorgServer.cmake | 4 ++++
+ 4 files changed, 16 insertions(+)
diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
index 153128a90..c19c31a96 100644
@@ -81,5 +81,28 @@ index 1550751ae..5b7af5e79 100644
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(XorgLibinput REQUIRED_VARS
XORGLIBINPUT_INCLUDE_DIRS)
+diff --git a/cmake/modules/FindXorgServer.cmake
b/cmake/modules/FindXorgServer.cmake
+index 5248c6d25..9de16dba0 100644
+--- a/cmake/modules/FindXorgServer.cmake
++++ b/cmake/modules/FindXorgServer.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+
++if(NOT XORGSERVER_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_XORGSERVER xorg-server)
+
+@@ -39,6 +41,8 @@ find_path(XORGSERVER_INCLUDE_DIRS
+ HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR}
+ )
+
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(XORGSERVER REQUIRED_VARS
XORGSERVER_INCLUDE_DIRS)
+
--
2.26.2
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 37923f2037..a56f7a6f47 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -135,7 +135,7 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream
patch
+ "${FILESDIR}/${PN}-5.18.5-override-include-dirs.patch" # downstream
patch
)
src_unpack() {
@@ -165,6 +165,7 @@ src_configure() {
$(cmake_use_find_package fontconfig Fontconfig)
-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include
-DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
