diff --git a/0001-Touch-hotkeys-touch-pad-without-customized-driver.patch b/0001-Touch-hotkeys-touch-pad-without-customized-driver.patch new file mode 100644 index 0000000..3803fe0 --- /dev/null +++ b/0001-Touch-hotkeys-touch-pad-without-customized-driver.patch @@ -0,0 +1,46 @@ +From 2f4033cf0d53323a70fbbae1d45ee9a82cf4e1d2 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Tue, 12 Jul 2022 14:06:29 +0800 +Subject: [PATCH] Touch hotkeys touch pad without customized driver + +--- + daemon/kmdaemon.cpp | 7 ++++++- + debian/changelog | 7 +++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/daemon/kmdaemon.cpp b/daemon/kmdaemon.cpp +index 868255f..de12c4a 100644 +--- a/daemon/kmdaemon.cpp ++++ b/daemon/kmdaemon.cpp +@@ -491,7 +491,12 @@ void KMDaemon::touchpadToggle(){ + XDeviceInfo deviceinfo = deviceinfos[i]; + + if (deviceinfo.type != XInternAtom (display, XI_TOUCHPAD, False)){ +- continue; ++ if (deviceinfo.type == XInternAtom(display, XI_MOUSE, False) && strstr(deviceinfo.name, "PS\/2")){ ++ ++ } else { ++ continue; ++ } ++ + } + + prop = XInternAtom (display, "Device Enabled", False); +diff --git a/debian/changelog b/debian/changelog +index b9f4c8b..e4113af 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,3 +1,10 @@ ++kylin-display-switch (3.0.13kylin18~rc1) v101; urgency=medium ++ ++ * ChangeDesc1: 适配PS/2触摸板没有厂商定制驱动情况下的触摸板热键 ++ * ChangeDesc2: quilt -> native ++ ++ -- hebing Mon, 21 Jun 2021 16:51:24 +0800 ++ + kylin-display-switch (3.0.13-1) focal; urgency=medium + + * New upstream release. +-- +2.33.0 + diff --git a/kylin-display-switch.spec b/kylin-display-switch.spec index 9a33f22..d7888da 100644 --- a/kylin-display-switch.spec +++ b/kylin-display-switch.spec @@ -1,23 +1,25 @@ %define debug_package %{nil} Name: kylin-display-switch Version: 3.0.13 -Release: 1 +Release: 2 Summary: Gui tool for display switching License: GPL-3 URL: https://github.com/ukui/kylin-display-switch Source0: %{name}-%{version}.tar.gz -BuildRequires: python3-rpm-macros -BuildRequires: python-rpm-macros -BuildRequires: qt5-qtbase-devel -BuildRequires: libxcb-devel -BuildRequires: xcb-util-devel -BuildRequires: libX11-devel -BuildRequires: libXtst-devel -BuildRequires: gsettings-qt-devel -BuildRequires: mate-desktop-devel -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: libkscreen-qt5-devel -BuildRequires: libxkbcommon-devel +Patch1: 0001-Touch-hotkeys-touch-pad-without-customized-driver.patch + +BuildRequires: python3-rpm-macros +BuildRequires: python-rpm-macros +BuildRequires: qt5-qtbase-devel +BuildRequires: libxcb-devel +BuildRequires: xcb-util-devel +BuildRequires: libX11-devel +BuildRequires: libXtst-devel +BuildRequires: gsettings-qt-devel +BuildRequires: mate-desktop-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: libkscreen-qt5-devel +BuildRequires: libxkbcommon-devel %description @@ -30,6 +32,7 @@ BuildRequires: libxkbcommon-devel %prep %setup -q +%patch1 -p1 %build %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-display-switch.pro %{make_build} @@ -58,6 +61,9 @@ make INSTALL_ROOT=%{buildroot} install %{_datadir}/glib-2.0/schemas/org.ukui.kds.gschema.xml %changelog +* Tue Jul 12 2022 peijiankang - 3.0.13-2 +- Touch hotkeys touch pad without customized driver + * Wed Mar 02 2022 tanyulong - 3.0.13-1 - update upstream version 3.0.13