diff options
Diffstat (limited to 'kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch')
-rw-r--r-- | kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch | 108 |
1 files changed, 108 insertions, 0 deletions
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch new file mode 100644 index 000000000000..ffbf2b644292 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch @@ -0,0 +1,108 @@ +From 6971b5eac2088d263527b2b4a85bb08b1a2dc792 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 6 Apr 2020 00:41:07 +0200 +Subject: [PATCH] cmake modules: Allow include dir overrides for various input + drivers + +FindEvdev - evdev-properties.h +FindSynaptics - synaptics-properties.h +FindXorgLibinput - libinput-properties.h +FindXorgServer - xserver-properties.h +--- + cmake/modules/FindEvdev.cmake | 4 ++++ + cmake/modules/FindSynaptics.cmake | 4 ++++ + cmake/modules/FindXorgLibinput.cmake | 4 ++++ + 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 +--- a/cmake/modules/FindEvdev.cmake ++++ b/cmake/modules/FindEvdev.cmake +@@ -31,6 +31,8 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + ++if(NOT Evdev_INCLUDE_DIRS) ++ + find_package(PkgConfig) + pkg_check_modules(PC_EVDEV xorg-evdev>=2.8.99.1) + +@@ -39,6 +41,8 @@ find_path(Evdev_INCLUDE_DIRS + HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR} + ) + ++endif() ++ + 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 ++++ b/cmake/modules/FindXorgLibinput.cmake +@@ -31,6 +31,8 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + ++if(NOT XORGLIBINPUT_INCLUDE_DIRS) ++ + find_package(PkgConfig) + pkg_check_modules(PC_XORGLIBINPUT xorg-libinput) + +@@ -39,6 +41,8 @@ find_path(XORGLIBINPUT_INCLUDE_DIRS + HINTS ${PC_XORGLIBINPUT_INCLUDE_DIRS} ${PC_XORGLIBINPUT_INCLUDEDIR} + ) + ++endif() ++ + 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 + |