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 EBD7A138350 for ; Sun, 26 Apr 2020 21:37:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13A7CE09DE; Sun, 26 Apr 2020 21:37:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D608AE09DE for ; Sun, 26 Apr 2020 21:37:29 +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 496B634F943 for ; Sun, 26 Apr 2020 21:37:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D08AD1B4 for ; Sun, 26 Apr 2020 21:37:26 +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: <1587937026.794dd1b9408892377b6791e0ecf4a5015bedb2a0.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.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/files/ kde-plasma/plasma-desktop/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 794dd1b9408892377b6791e0ecf4a5015bedb2a0 X-VCS-Branch: master Date: Sun, 26 Apr 2020 21:37:26 +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: f5da9431-bcac-4a98-8104-0809813a9bf2 X-Archives-Hash: 4046f7bb17d4ec10081d2db7bdbfd681 commit: 794dd1b9408892377b6791e0ecf4a5015bedb2a0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 26 21:36:07 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 26 21:37:06 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=794dd1b9 kde-plasma/plasma-desktop: Patch upstreamed Upstream commit 2e8a98a5110732bbddef778d3ba547fd28a1d576 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../plasma-desktop-5.18.80-synaptics-header.patch | 26 ---------------------- .../plasma-desktop-5.18.4.1-r3.ebuild | 2 +- .../plasma-desktop-5.18.49.9999.ebuild | 2 +- .../plasma-desktop/plasma-desktop-9999.ebuild | 1 - 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 6987d71ef6..0000000000 --- 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 -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 c6729eedfe..55899f045b 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 aafdf56ec2..2f9db4b85d 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 4ef6e14442..37923f2037 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() {