diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-04-26 23:36:07 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-04-26 23:37:06 +0200 |
| commit | 794dd1b9408892377b6791e0ecf4a5015bedb2a0 (patch) | |
| tree | 1a3e0256b197c256a598f52ea71fbda754b7b78f | |
| parent | 36fe885f534f491eaeb2e9d71b69df2b4a847cfb (diff) | |
| download | kde-794dd1b9408892377b6791e0ecf4a5015bedb2a0.tar.gz kde-794dd1b9408892377b6791e0ecf4a5015bedb2a0.tar.bz2 kde-794dd1b9408892377b6791e0ecf4a5015bedb2a0.zip | |
kde-plasma/plasma-desktop: Patch upstreamed
Upstream commit 2e8a98a5110732bbddef778d3ba547fd28a1d576
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
4 files changed, 2 insertions, 29 deletions
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch deleted file mode 100644 index 6987d71ef68..00000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/backends/x11/synapticstouchpad.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kcms/touchpad/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/backends/x11/synapticstouchpad.cpp -index d2f41d70b..3eb3171ee 100644 ---- a/kcms/touchpad/backends/x11/synapticstouchpad.cpp -+++ b/kcms/touchpad/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/plasma-desktop-5.18.4.1-r3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild index c6729eedfed..55899f045be 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild @@ -136,7 +136,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${P}-override-include-dirs.patch" # downstream patch - "${FILESDIR}/${P}-synaptics-header.patch" # TODO upstream + "${FILESDIR}/${P}-synaptics-header.patch" # in Plasma/5.19 ) src_unpack() { diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild index aafdf56ec2b..2f9db4b85d9 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild @@ -136,7 +136,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch - "${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # TODO upstream + "${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19 ) src_unpack() { diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index 4ef6e144420..37923f20376 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -136,7 +136,6 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch - "${FILESDIR}/${PN}-5.18.80-synaptics-header.patch" # TODO upstream ) src_unpack() { |