diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /kde-plasma/plasma-desktop/files | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'kde-plasma/plasma-desktop/files')
3 files changed, 264 insertions, 0 deletions
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch new file mode 100644 index 000000000000..181e89e7db38 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch @@ -0,0 +1,26 @@ +From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 24 Apr 2020 18:55:30 +0200 +Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent + dir from include + +--- + kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp +index d2f41d70b..3eb3171ee 100644 +--- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp ++++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp +@@ -53,7 +53,7 @@ + + #include <stddef.h> + #include <limits.h> +-#include <xorg/synaptics-properties.h> ++#include <synaptics-properties.h> + + #define SYN_MAX_BUTTONS 12 + +-- +2.26.2 + diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch new file mode 100644 index 000000000000..115d52423fbf --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch @@ -0,0 +1,130 @@ +From 82e7a6b68d81ca2be0fdc3fc13cd5ca5f5e03e81 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 7 May 2020 16:18:13 +0200 +Subject: [PATCH] Add FindXorgServer.cmake and use it for touchpad KCM + +Summary: +x11 backend of the touchpad KCM uses xserver-properties.h that is part of +xorg-server package. As XORG_INCLUDE_DIRS seems to be empty, so far, it was +relying on Synaptics_INCLUDE_DIRS implicitly and worked only if the header +happened to be in the same directory as Synaptics' which is the case most of +the time. + +FindXorgServer.cmake is just a copy of FindXorgLibinput, adapted accordingly. + +Test Plan: +Pointed Synaptics_INCLUDE_DIRS somewhere else than /usr/include/xorg and build +succeeded. + +Reviewers: #plasma, zzag + +Reviewed By: #plasma, zzag + +Subscribers: broulik, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D29514 +--- + CMakeLists.txt | 4 +++ + cmake/modules/FindXorgServer.cmake | 45 ++++++++++++++++++++++++++++++ + kcms/CMakeLists.txt | 2 +- + kcms/touchpad/src/backends/x11.cmake | 2 +- + 4 files changed, 51 insertions(+), 2 deletions(-) + create mode 100644 cmake/modules/FindXorgServer.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fbdd95433..64e8bbd60 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -133,6 +133,10 @@ find_package(Synaptics) + set_package_properties(Synaptics PROPERTIES TYPE OPTIONAL) + add_feature_info("Synaptics" SYNAPTICS_FOUND "Synaptics libraries needed for touchpad KCM") + ++find_package(XorgServer) ++set_package_properties(XorgServer PROPERTIES TYPE OPTIONAL) ++add_feature_info("XorgServer" XORGSERVER_FOUND "XServer header needed for touchpad KCM (X11 backend)") ++ + find_package(XorgLibinput) + set_package_properties(XorgLibinput PROPERTIES TYPE OPTIONAL) + add_feature_info("XorgLibinput" XORGLIBINPUT_FOUND "Libinput driver headers needed for mouse and touchpad KCM") +diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake +new file mode 100644 +index 000000000..5248c6d25 +--- /dev/null ++++ b/cmake/modules/FindXorgServer.cmake +@@ -0,0 +1,45 @@ ++# - Find xorg-server's headers. ++# This module defines the following variables: ++# ++# XORGSERVER_FOUND - true if xserver was found ++# XORGSERVER_INCLUDE_DIRS - include path for xserver ++# There are no libraries, just a header file ++# ++# Copyright (c) 2020 Andreas Sturmlechner <asturm@gentoo.org> ++# ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions ++# are met: ++# 1. Redistributions of source code must retain the above copyright ++# notice, this list of conditions and the following disclaimer. ++# 2. Redistributions in binary form must reproduce the above copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++# 3. Neither the name of the University nor the names of its contributors ++# may be used to endorse or promote products derived from this software ++# without specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++# SUCH DAMAGE. ++ ++find_package(PkgConfig) ++pkg_check_modules(PC_XORGSERVER xorg-server) ++ ++find_path(XORGSERVER_INCLUDE_DIRS ++ NAMES xserver-properties.h ++ HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR} ++) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS) ++ ++mark_as_advanced(XORGSERVER_INCLUDE_DIRS) +diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt +index 7ab966e8e..ce730f537 100644 +--- a/kcms/CMakeLists.txt ++++ b/kcms/CMakeLists.txt +@@ -58,7 +58,7 @@ if(X11_Xcursor_FOUND) + add_subdirectory(cursortheme) + endif() + +-if (SYNAPTICS_FOUND AND X11_Xinput_FOUND) ++if (XORGSERVER_FOUND AND SYNAPTICS_FOUND AND X11_Xinput_FOUND) + add_subdirectory(touchpad) + endif() + +diff --git a/kcms/touchpad/src/backends/x11.cmake b/kcms/touchpad/src/backends/x11.cmake +index 9248eff7c..8a584e939 100644 +--- a/kcms/touchpad/src/backends/x11.cmake ++++ b/kcms/touchpad/src/backends/x11.cmake +@@ -11,7 +11,7 @@ endif() + include_directories(${X11_Xinput_INCLUDE_PATH} + ${X11_X11_INCLUDE_PATH} + ${Synaptics_INCLUDE_DIRS} +- ${XORG_INCLUDE_DIRS} ++ ${XORGSERVER_INCLUDE_DIRS} + ) + + SET(backend_SRCS +-- +2.26.2 + 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 + |