From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1AF0F138350 for ; Sat, 25 Apr 2020 12:58:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4169BE09BA; Sat, 25 Apr 2020 12:58:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CD38E09BA for ; Sat, 25 Apr 2020 12:58:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16A8534EFA4 for ; Sat, 25 Apr 2020 12:58:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BEEC41C5 for ; Sat, 25 Apr 2020 12:58:19 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1587819472.142fb5031705e9d3dfe100c424ca5e8a7eaa4995.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ kde-plasma/plasma-desktop/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 142fb5031705e9d3dfe100c424ca5e8a7eaa4995 X-VCS-Branch: master Date: Sat, 25 Apr 2020 12:58:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0a3c4d47-627c-4fa5-86b5-f7c1090c4ed9 X-Archives-Hash: 0bc8f44d67916b697c1d424124e79daa commit: 142fb5031705e9d3dfe100c424ca5e8a7eaa4995 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 25 12:57:52 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 -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 - #include --#include -+#include - - #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 +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 + #include +-#include ++#include + + #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 +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 + #include +-#include ++#include + + #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() {