diff --git a/plasma-desktop-5.18.4.1-synaptics_includes.patch b/plasma-desktop-5.18.4.1-synaptics_includes.patch new file mode 100644 index 0000000..760c3eb --- /dev/null +++ b/plasma-desktop-5.18.4.1-synaptics_includes.patch @@ -0,0 +1,12 @@ +diff -up plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp.syn plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp +--- plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp.syn 2020-03-31 09:24:01.000000000 -0500 ++++ plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp 2020-05-03 13:20:06.830569831 -0500 +@@ -42,7 +42,7 @@ + #include + #include + +-#include ++#include + #include + + struct DeviceListDeleter diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 7389d4f..f227ebd 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -37,6 +37,7 @@ Patch100: plasma-desktop-5.8-default_favorites.patch Patch200: https://gitweb.gentoo.org/proj/kde.git/plain/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch # use this bundled copy (from f31) if not provided already Source200: synaptics-properties.h +Patch201: plasma-desktop-5.18.4.1-synaptics_includes.patch # filter qmk/plugins provides %global __provides_exclude_from ^(%{_kf5_qmldir}/.*\\.so|%{_kf5_qtplugindir}/.*\\.so)$ @@ -195,6 +196,7 @@ BuildArch: noarch %if ! 0%{?synaptics} install -pD %{SOURCE200} 3rdparty/xorg/synaptics-properties.h %endif +%patch201 -p1 -b .synaptics_includes ## downstream patches %patch100 -p1 @@ -218,7 +220,7 @@ sed -i.breeze_ver \ mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. \ - %{?!synaptics:-DSynaptics_INCLUDE_DIRS:PATH="$(pwd)/3rdparty"} + %{?!synaptics:-DSynaptics_INCLUDE_DIRS:PATH="$(pwd)/../3rdparty"} popd %make_build -C %{_target_platform}