From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- kde-plasma/Manifest.gz | Bin 7415 -> 7414 bytes kde-plasma/plasma-desktop/Manifest | 3 +- ...ktop-5.13.5-libinput-kcm-ignore-touchpads.patch | 139 +++++++++++++++++ .../plasma-desktop/plasma-desktop-5.13.5-r1.ebuild | 168 -------------------- .../plasma-desktop/plasma-desktop-5.13.5-r2.ebuild | 169 +++++++++++++++++++++ 5 files changed, 310 insertions(+), 169 deletions(-) create mode 100644 kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch delete mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r1.ebuild create mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r2.ebuild (limited to 'kde-plasma') diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz index 6f6eb2662669..89b995fc67a9 100644 Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 3ac49e52562d..b942e547de7e 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,10 +1,11 @@ AUX plasma-desktop-5.12.5-submodules-update.patch 1016 BLAKE2B 7ff9a57181b1438027cdf2aaf0e5d6dad25125c79c9cdb349b1d4b271638f1fb77f0742b3d67060ad74f26a820765260796eacd8cd994263fc00fcb13b82ace0 SHA512 c283923a0f5473e6017b1160f3a15f7ec277196cc55b14c03bc77a56188b44c9d58010abfe85d1e6c2c25fdda1f3b35ea3bbe9525bbbd80c8ab82d6e28960a9a AUX plasma-desktop-5.13.5-activityswitcher.patch 2194 BLAKE2B 992d63a598b804f380a2d0f893f6d1295bc8e96f4afaff8472566f6c915e388542ed46cf183803687de04889e4d66cf63dc47c45d5ffabfa4b8e57cc7322587e SHA512 4431a3766e9faa6c2026ea73753691bf7f8d8d29c3e8dff67060772a9a2caaafa3bd760b19817874d411f6f4d275ea46abcb437460753b50edaf52dc4718a4a6 AUX plasma-desktop-5.13.5-kickersearch-nav.patch 3897 BLAKE2B ca412633e3d09f924a03f26b0019e5967fea7a54e03f921c6ba23178cbb91f314094bffae28f97a96800379d723ad3db1e783a557d106a6a0a6e2cd4905e458d SHA512 c5e43ca565aeaa19bb8b5cf7307c60a1fdc2b1600552e4860a79fe261bf681a2954b44a3b34462e2b5164f7848b0f827ba21494022360eaa565a6675c2e6bd45 +AUX plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch 5132 BLAKE2B 5653c5d6e0403fedb314d2cef4c5de20adc9d142cd197fd41b2bbe471e2e3b28cca2a6ca052d1e88c3c07e511b2345ed68ec72108519945da34094ef6f700ae8 SHA512 33d8436643418e8e9806f23862c9c0cbea65dd1360face47f4f21a61b79ecadcbfc3dde93865a76ac76f7591198a7935496260a1c257e0291367c3455a025dc4 DIST plasma-desktop-5.12.5.tar.xz 8558436 BLAKE2B ecd8a0ce7532dadde5f435e4c620333572b30e50a5003493495784bb31f7e9a4c1b0b1a023290b0443fa90ee7e663fefb9854016bb8eb5a03f82f879d6522fc6 SHA512 d19f8d640304bc1ffa0839e8ba453ddea76710f26fe580789c64e1b97d2a67c151ec62b2d0503fc35ad31cb8da4ef1125f3154e366b7f2bb4b8fb9bb2e0a6abb DIST plasma-desktop-5.12.7.tar.xz 9204292 BLAKE2B 90d7e659b2ba25975ae5883f783671cbd661388429bdac4afb9459f4d56771bf535166be75fcdc055a94a3072edc938155502bf1e9c9950c4e18f6ef0858d26d SHA512 671108c3c1c46bc0dfdbc2eb1438654c84ee3bc098c137466ab28d230651f20251894b3008a030a0c3bf2aa4904cca61418c458f41a023042630c6f80d4bf41d DIST plasma-desktop-5.13.5.tar.xz 9141164 BLAKE2B f48ab6648cb1c7c289b5a2cce670db774aa53cbd81095cd4aa60414d05a0fac1e460fde115d5d38dd639a7746b1ad83971e38b28841aa430cec3f318e3509930 SHA512 3dd8f27e0127f7568aeee3871ce2f0732267ef50f9659a4a2715eca65bdf8cc5cbd2ca5e39a261cbbf0d1127c9c153f1c2d279729b636184353c6fbb699c4383 EBUILD plasma-desktop-5.12.5-r1.ebuild 4495 BLAKE2B 51f2671d3e48f65707b28cf6eb29f6ff26e5e444e06e16ec918d40b803d4c247168f226000ad167530852ff27d721331c0a3d4cd6c3c1aee72e7fcb6fe953f41 SHA512 a2d9148faf259057b3e6b7746b804fd1ae6384714adb57b53f306246992541968faaf9d44acc22e4f4ae34c46068310d37ea3fb66457fe0e52a424c32c96f592 EBUILD plasma-desktop-5.12.7.ebuild 4418 BLAKE2B fe4d17ca74217a6a55aa18b73a4f7d4c4fbc1136c0c25197e6bf84d98dc46ca4025e75241cd4367e332752d1d3480574115186eea8fb03457f5683dfdd2ea87c SHA512 04019f52fe92716dbc401803519e2554c60f14a0097f0bb87ca022938d3fa4b02f89517460f486fd9a1481b11880ff8eaa0c41f67604b3163b2f3f2e7fe1a6ee -EBUILD plasma-desktop-5.13.5-r1.ebuild 4564 BLAKE2B 55a097db38f5d7c6cbcde5a47993c3ba356f451f6bad41ac70ddb0eef96b5223fd9293305a7b920e8c83edbf006063ae91cc6b9c03e25e77de6b2dbb7dedb3ba SHA512 d8f06624fcec7657efd69834dce3e442cf702a4ce12a4f0ac2ee42ddc45ae8353765c07c18d6b79cd333081fc7b2aff5f36140b8e83967ca915c66fc1d631714 +EBUILD plasma-desktop-5.13.5-r2.ebuild 4617 BLAKE2B e7f678cbb95c53d4eb4e3bf14f344bbc1ef362b426fdccde47b73181093ff10a14afa8e508c0fee94fce332c41e86eacf970d154f06bc4b83cd0f82f75a27873 SHA512 f8c4d788f9cf10460a5398ce38264daa2ec8a76cda106847560f0f57e55913fda8100a1281f093418d7043f22d68055a906cd7e48ace07b2a85cef5130b5f6e3 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch new file mode 100644 index 000000000000..76b3e1b0f3ed --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch @@ -0,0 +1,139 @@ +From a4c724173b5c6a59331587f2e5db746dffbabdc6 Mon Sep 17 00:00:00 2001 +From: Roman Gilg +Date: Tue, 4 Sep 2018 00:15:18 +0200 +Subject: [Mouse KCM] Avoid changes to touchpads in libinput backend + +Summary: +Similar to evdev backend we need to ignore touchpad devices explicitly in the +libinput backend because these are also pointer devices. + +XInput2 can do this in theory via input classes, but my touchpad did not set +the class correctly. So just switch to using XInput like in the evdev backend +to query all pointer devices and then use the XI_TOUCHPAD atom to filter out +touchpads. + +BUG: 395401 +BUG: 395722 +BUG: 396269 + +Test Plan: Manually + +Reviewers: #plasma, hein + +Reviewed By: #plasma, hein + +Subscribers: acrouthamel, ngraham, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D15256 +--- + .../backends/x11/x11_libinput_dummydevice.cpp | 32 ++++++++++++++-------- + 1 file changed, 20 insertions(+), 12 deletions(-) + +diff --git a/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp b/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp +index 6efca42..7ec314b 100644 +--- a/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp ++++ b/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp +@@ -20,24 +20,28 @@ + + #include + +-#include + #include + #include ++#include ++ ++static Atom s_touchpadAtom; + + template +-static void XI2ForallPointerDevices(Display* dpy, const Callback& callback) ++static void XIForallPointerDevices(Display* dpy, const Callback& callback) + { + int ndevices_return; +- XIDeviceInfo* info = XIQueryDevice(dpy, XIAllDevices, &ndevices_return); ++ XDeviceInfo *info = XListInputDevices(dpy, &ndevices_return); + if (!info) { + return; + } + for (int i = 0; i < ndevices_return; ++i) { +- if ((info + i)->use == XISlavePointer) { +- callback(info + i); ++ XDeviceInfo *dev = info + i; ++ if ((dev->use == IsXPointer || dev->use == IsXExtensionPointer) && ++ dev->type != s_touchpadAtom) { ++ callback(dev); + } + } +- XIFreeDeviceInfo(info); ++ XFreeDeviceList(info); + } + + struct ScopedXDeleter { +@@ -61,7 +65,8 @@ void valueWriterPart(T val, Atom valAtom, Display *dpy) + template<> + void valueWriterPart(bool val, Atom valAtom, Display *dpy) + { +- XI2ForallPointerDevices(dpy, [&] (XIDeviceInfo *info) { ++ XIForallPointerDevices(dpy, [&] (XDeviceInfo *info) { ++ int deviceid = info->id; + Status status; + Atom type_return; + int format_return; +@@ -70,7 +75,7 @@ void valueWriterPart(bool val, Atom valAtom, Display *dpy) + + unsigned char *_data = nullptr; + //data returned is an 1 byte boolean +- status = XIGetProperty(dpy, info->deviceid, valAtom, 0, 1, ++ status = XIGetProperty(dpy, deviceid, valAtom, 0, 1, + False, XA_INTEGER, &type_return, &format_return, + &num_items_return, &bytes_after_return, &_data); + if (status != Success) { +@@ -87,7 +92,7 @@ void valueWriterPart(bool val, Atom valAtom, Display *dpy) + + unsigned char sendVal = val ? 1 : 0; + +- XIChangeProperty(dpy, info->deviceid, valAtom, XA_INTEGER, ++ XIChangeProperty(dpy, deviceid, valAtom, XA_INTEGER, + 8, XIPropModeReplace, &sendVal, 1); + + }); +@@ -96,7 +101,8 @@ void valueWriterPart(bool val, Atom valAtom, Display *dpy) + template<> + void valueWriterPart(qreal val, Atom valAtom, Display *dpy) + { +- XI2ForallPointerDevices(dpy, [&] (XIDeviceInfo *info) { ++ XIForallPointerDevices(dpy, [&] (XDeviceInfo *info) { ++ int deviceid = info->id; + Status status; + Atom float_type = XInternAtom (dpy, "FLOAT", False); + Atom type_return; +@@ -106,7 +112,7 @@ void valueWriterPart(qreal val, Atom valAtom, Display *dpy) + + unsigned char *_data = nullptr; + //data returned is an 1 byte boolean +- status = XIGetProperty(dpy, info->deviceid, valAtom, 0, 1, ++ status = XIGetProperty(dpy, deviceid, valAtom, 0, 1, + False, float_type, &type_return, &format_return, + &num_items_return, &bytes_after_return, &_data); + if (status != Success) { +@@ -125,7 +131,7 @@ void valueWriterPart(qreal val, Atom valAtom, Display *dpy) + float *sendPtr = (float*)buffer; + *sendPtr = val; + +- XIChangeProperty(dpy, info->deviceid, valAtom, float_type, ++ XIChangeProperty(dpy, deviceid, valAtom, float_type, + format_return, XIPropModeReplace, buffer, 1); + + }); +@@ -161,6 +167,8 @@ X11LibinputDummyDevice::X11LibinputDummyDevice(QObject *parent, Display *dpy) + + m_supportsNaturalScroll.val = true; + m_naturalScrollEnabledByDefault.val = false; ++ ++ s_touchpadAtom = XInternAtom(m_dpy, XI_TOUCHPAD, True); + } + + X11LibinputDummyDevice::~X11LibinputDummyDevice() +-- +cgit v0.11.2 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r1.ebuild deleted file mode 100644 index 06140e915b17..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r1.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KDE Plasma desktop" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad" - -COMMON_DEPEND=" - $(add_frameworks_dep attica) - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kactivities-stats) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kded) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpeople) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_frameworks_dep sonnet) - $(add_plasma_dep kwin) - $(add_plasma_dep plasma-workspace) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxcb - x11-libs/libxkbfile - appstream? ( dev-libs/appstream[qt5] ) - fontconfig? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - x11-libs/xcb-util-image - ) - ibus? ( - $(add_qt_dep qtx11extras) - app-i18n/ibus - dev-libs/glib:2 - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) - pulseaudio? ( - dev-libs/glib:2 - media-libs/libcanberra - media-sound/pulseaudio - ) - scim? ( app-i18n/scim ) - semantic-desktop? ( $(add_frameworks_dep baloo) ) - touchpad? ( x11-drivers/xf86-input-synaptics ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - x11-base/xorg-proto - fontconfig? ( x11-libs/libXrender ) - mouse? ( - x11-drivers/xf86-input-evdev - x11-drivers/xf86-input-libinput - ) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep qqc2-desktop-style) - $(add_plasma_dep breeze) - $(add_plasma_dep kde-cli-tools) - $(add_plasma_dep oxygen) - $(add_qt_dep qtgraphicaleffects) - sys-apps/accountsservice - sys-apps/util-linux - x11-apps/setxkbmap - pulseaudio? ( $(add_plasma_dep plasma-pa ) ) - !kde-apps/kcontrol - !