From f78108598211053d41752a83e0345441bb9014ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Feb 2018 16:09:52 +0000 Subject: gentoo resync : 11.02.2018 --- kde-apps/konsole/Manifest | 3 +- .../konsole-17.12.1-libinput-pixeldelta.patch | 54 ++++++++++++++++++++ kde-apps/konsole/konsole-17.12.1-r1.ebuild | 58 ++++++++++++++++++++++ kde-apps/konsole/konsole-17.12.1.ebuild | 56 --------------------- 4 files changed, 114 insertions(+), 57 deletions(-) create mode 100644 kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch create mode 100644 kde-apps/konsole/konsole-17.12.1-r1.ebuild delete mode 100644 kde-apps/konsole/konsole-17.12.1.ebuild (limited to 'kde-apps/konsole') diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 4ac3df5767ed..3e92509dd0ce 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,5 +1,6 @@ +AUX konsole-17.12.1-libinput-pixeldelta.patch 1914 BLAKE2B 27fdeb10eb73f0e935ade90c3c453256e5e8bde94ef4ae3920b6e6caeb109c8fba226698745c6d7116116e3c0e6c8aaf935e77c503bba52549874b861d26809d SHA512 0d9cda130728f6b5e618b73fbc9c07431b924d6190df8f91f7801b798822ce001e7b077fde2992dd8f570bac9e7af857576e149fbffbfe37ae4e9a7b3873cb5b DIST konsole-17.08.3.tar.xz 1021860 BLAKE2B 62771c923614aefaa9a246fe2a937ba61f9de55e067dd04a8e24a9ad6f026b6c4efc36e3ef4244b98e6266cb685707b46be359e99886f99d1857a02b21570da8 SHA512 1d2723ba3dd988b3b1deaadf5ccf10455bf48d9c5961e9d614342bd5c0dbb7b42b461b529f4eb6a5ba855951f5b2d7d1d4f93170091ea3b47f02ac70c2583f4b DIST konsole-17.12.1.tar.xz 1026684 BLAKE2B 87601e07187721e8533f919cd553d97ec0cb2a8e986f4b049c4ae4eb80b93e42f33d6357734fe10492ec2db0210ccd4bc81a6950d02971e71caad952eadd5000 SHA512 af1e2e0ecb18a213de0ab452ed7db5b17ac477571b9d5ebaadad407714733e80f379f7ee6a506312c42e9bfe5990087b6f63655d18dc1cb302ff1bd446c2dfdb EBUILD konsole-17.08.3.ebuild 1387 BLAKE2B 4e21aa58c799e91ab8aa3894d512f1d15310e1f03c3ed5aa6b8887dc0b5944ac94fe1a9910941a68810705ea1fe8d9605aafba29dfa12e9bc046d20376f93ee9 SHA512 078bcdb02eaf222909b09d801617918cabe53b16ad80270b9136f2089fbb0f37b0b82d42016f5502c06c4413541ac3b958d0ba2319a08fbb612fa0806c92b312 -EBUILD konsole-17.12.1.ebuild 1389 BLAKE2B bd0818c2f126c6442662bb569b5a4e9b5b19b5e6aa09b2785b73943f3f3ee90ef5ccc784021a18f3d273d491ccda6775ef3ffb96a7816235029c5772ac7fecb4 SHA512 ba7de247be3a08c413ef6e1efcc6d1eeb3187e0c845f132c3fc80f279f20ca8df3b23a95c85a6ec658e26d764ba9472c2d7231377ab3f8a82bdabae52e859324 +EBUILD konsole-17.12.1-r1.ebuild 1447 BLAKE2B 8a3982f11e37312811b89950d34d680615882edd209f454e2ce581d3ef5fdc5da846afd53af8d00492dd6ce246307867dfe40be88c2e61e366bd4835596d505a SHA512 9a6ad1db74c3282b7d132b2fafab5204a2bc96892d5f9b2acb93580d99404fc545eceb685b87993e433af5503af5e9a105d8f7e0dbfa6ae0b6eec98e06ebb392 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 new file mode 100644 index 000000000000..37049b9b2f2a --- /dev/null +++ b/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch @@ -0,0 +1,54 @@ +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.1-r1.ebuild b/kde-apps/konsole/konsole-17.12.1-r1.ebuild new file mode 100644 index 000000000000..8e2357bbc0a9 --- /dev/null +++ b/kde-apps/konsole/konsole-17.12.1-r1.ebuild @@ -0,0 +1,58 @@ +# 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}/${P}-libinput-pixeldelta.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} diff --git a/kde-apps/konsole/konsole-17.12.1.ebuild b/kde-apps/konsole/konsole-17.12.1.ebuild deleted file mode 100644 index c091c44e38a2..000000000000 --- a/kde-apps/konsole/konsole-17.12.1.ebuild +++ /dev/null @@ -1,56 +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}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package X X11) - ) - - kde5_src_configure -} -- cgit v1.2.3