From f625b9919a60a30f1bd860f7d1b2eac183ced593 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 Aug 2018 20:11:47 +0100 Subject: gentoo resync : 08.08.2018 --- kde-apps/konsole/Manifest | 3 -- .../konsole-17.12.1-libinput-pixeldelta.patch | 54 -------------------- kde-apps/konsole/konsole-17.12.3.ebuild | 58 ---------------------- 3 files changed, 115 deletions(-) delete mode 100644 kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch delete mode 100644 kde-apps/konsole/konsole-17.12.3.ebuild (limited to 'kde-apps/konsole') diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index f7f34418c9bd..b2ad734ae3c0 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,6 +1,3 @@ -AUX konsole-17.12.1-libinput-pixeldelta.patch 1914 BLAKE2B 27fdeb10eb73f0e935ade90c3c453256e5e8bde94ef4ae3920b6e6caeb109c8fba226698745c6d7116116e3c0e6c8aaf935e77c503bba52549874b861d26809d SHA512 0d9cda130728f6b5e618b73fbc9c07431b924d6190df8f91f7801b798822ce001e7b077fde2992dd8f570bac9e7af857576e149fbffbfe37ae4e9a7b3873cb5b -DIST konsole-17.12.3.tar.xz 1026672 BLAKE2B 98f2f545aae26965009a79d196640811702e9444a21c665db1f4da277a1059943f192a31ea1020c52867523ad40bfe21bc09503ec2643b289da1ed69c7eda30e SHA512 973c47341ebe729442ba8f8a7523eccaf5da28afbfe236fd4ec2897f710c3967f22ed5cd8f2f997f631a5369625c830f7a4540cdf6953874c2f556f547c413a0 DIST konsole-18.04.3.tar.xz 1043452 BLAKE2B 341d589ea00536913d008548affecf301f9c455661eb5630e345481d75c3feb0138e5dff23d25421d0f375381586c4dc72b511042cb4803dc75873a943c20658 SHA512 0809cf4db6e10e672a4a976609045fb88879fe615b48e452f140da0a6c44971f31a7b4606124ed3b7642ee3f3556ace45b31e0b5c466df611fea98a9cf702066 -EBUILD konsole-17.12.3.ebuild 1454 BLAKE2B eaa62cd6b0b0a5467bd2f66f48588a1c961d07e42441b1a64caa1533faa15df7a5549b3eb2ae4e59b6fd65f45f3ad0e53373509e61f514ff97a641c684131f64 SHA512 1ab838c8422d38cee71f1ec09613bd0b7077d844d037345144a2e905d63d90ba4c0f4a165ef7702dfd798a571cc03670b6fbb0ecba0d58704115f102bf8d5d87 EBUILD konsole-18.04.3.ebuild 1420 BLAKE2B f940eacd6525caabc7f69e5e89a8cf1b470d255a3334f98ade87b950b5c91ed45bdeec7769cfd274c32d39abf99e0ba9475d4284c5ea042ba546949d78e7f1b8 SHA512 8da1c3cc6e9ae895ba7fc992bad527de09e8355dc6d49fc74d5a925fa18b0b64b79233aaf5fad2617d7ac93ebe56594669a07487ddb1de0c8c825c5ce223fcc2 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch b/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch deleted file mode 100644 index 37049b9b2f2a..000000000000 --- a/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch +++ /dev/null @@ -1,54 +0,0 @@ -From d25e5ac7089f2c81cc5ffe8e155ba8b3dfb11b97 Mon Sep 17 00:00:00 2001 -From: Kurt Hindenburg -Date: Wed, 7 Feb 2018 10:38:09 -0500 -Subject: Fix mouse wheel scrolling with libinput - -If the Libinput X server input driver is used we get a value for -pixelDelta for a physical mouse wheel scroll, so we check that the -source of the wheel event is actually a mouse, this was fixed in -Qt 5.9.5* -https://bugreports.qt.io/browse/QTBUG-59261 - -Patch by ahmadsamir - -* fixed in Gentoo: Qt 5.9.4 - -BUG: 386762 -Differential Revision: https://phabricator.kde.org/D9008 ---- - src/ScrollState.cpp | 19 +++++++++++++++---- - 1 file changed, 15 insertions(+), 4 deletions(-) - -diff --git a/src/ScrollState.cpp b/src/ScrollState.cpp -index e5b486d..f71b142 100644 ---- a/src/ScrollState.cpp -+++ b/src/ScrollState.cpp -@@ -25,10 +25,21 @@ using namespace Konsole; - - void ScrollState::addWheelEvent(const QWheelEvent *wheel) - { -- if ((wheel->angleDelta().y() != 0) && (wheel->pixelDelta().y() == 0)) { -- _remainingScrollPixel = 0; -- } else { -- _remainingScrollPixel += wheel->pixelDelta().y(); -+ // If the Libinput X server input driver is used we get a value for -+ // pixelDelta for a physical mouse wheel scroll, so we check that -+ // the source of the wheel event is actually a mouse, this has been -+ // fixed upstream in Qt 5.9.5: https://bugreports.qt.io/browse/QTBUG-59261 -+ // Fixes Konsole BUG: https://bugs.kde.org/show_bug.cgi?id=386762 -+#if (QT_VERSION < QT_VERSION_CHECK(5, 9, 4)) -+ if (wheel->source() != Qt::MouseEventNotSynthesized) { -+#else -+ if (true) { -+#endif -+ if ((wheel->angleDelta().y() != 0) && (wheel->pixelDelta().y() == 0)) { -+ _remainingScrollPixel = 0; -+ } else { -+ _remainingScrollPixel += wheel->pixelDelta().y(); -+ } - } - _remainingScrollAngle += wheel->angleDelta().y(); - } --- -cgit v0.11.2 - diff --git a/kde-apps/konsole/konsole-17.12.3.ebuild b/kde-apps/konsole/konsole-17.12.3.ebuild deleted file mode 100644 index 546e7f2cc269..000000000000 --- a/kde-apps/konsole/konsole-17.12.3.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KDE's terminal emulator" -HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org" - -KEYWORDS="amd64 x86" -IUSE="X" - -DEPEND=" - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kinit) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpty) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - X? ( x11-libs/libX11 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-17.12.1-libinput-pixeldelta.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package X X11) - ) - - kde5_src_configure -} -- cgit v1.2.3