[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/

[Andreas Sturmlechner]

commit:     142fb5031705e9d3dfe100c424ca5e8a7eaa4995
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 12:57:52 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 12:57:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=142fb503

kde-plasma/plasma-desktop: Split override-include-dirs.patch

Files moved around after Plasma/5.18 branching.

Closes: https://bugs.gentoo.org/719328
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ma-desktop-5.18.4.1-override-include-dirs.patch | 28 ----------------------
 .../plasma-desktop-5.18.4.1-synaptics-header.patch | 26 ++++++++++++++++++++
 .../plasma-desktop-5.18.80-synaptics-header.patch  | 26 ++++++++++++++++++++
 .../plasma-desktop-5.18.4.1-r3.ebuild              |  3 ++-
 .../plasma-desktop-5.18.49.9999.ebuild             |  1 +
 .../plasma-desktop/plasma-desktop-9999.ebuild      |  1 +
 6 files changed, 56 insertions(+), 29 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.4.1-override-include-dirs.patch
index a9205ffc2a..3118913e08 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.4.1-override-include-dirs.patch
@@ -83,31 +83,3 @@ index 1550751ae..5b7af5e79 100644
  
 -- 
 2.26.2
-
-
-From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@g.o>
-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.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 0000000000..181e89e7db
--- /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@g.o>
+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.80-synaptics-header.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch
new file mode 100644
index 0000000000..6987d71ef6
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch
@@ -0,0 +1,26 @@
+From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@g.o>
+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 6e6fa790ec..c6729eedfe 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
@@ -135,7 +135,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${P}-override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${P}-synaptics-header.patch" # TODO upstream
 )
 
 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 74192183d6..aafdf56ec2 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,6 +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
 )
 
 src_unpack() {

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 37923f2037..4ef6e14442 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -136,6 +136,7 @@ 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() {