[arch-commits] Commit in deepin-daemon/trunk (3 files)
Felix Yan
felixonmars at archlinux.org
Mon Dec 28 13:21:56 UTC 2020
Date: Monday, December 28, 2020 @ 13:21:55
Author: felixonmars
Revision: 794900
upgpkg: deepin-daemon 5.11.0.41-1
Added:
deepin-daemon/trunk/deepin-daemon-fix-vanilla-libinput.patch
(from rev 794899, deepin-daemon/trunk/dde-daemon_5.9.4.2.diff)
Modified:
deepin-daemon/trunk/PKGBUILD
Deleted:
deepin-daemon/trunk/dde-daemon_5.9.4.2.diff
------------------------------------------+
PKGBUILD | 12 ++---
dde-daemon_5.9.4.2.diff | 34 ----------------
deepin-daemon-fix-vanilla-libinput.patch | 59 +++++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 40 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-12-28 13:20:40 UTC (rev 794899)
+++ PKGBUILD 2020-12-28 13:21:55 UTC (rev 794900)
@@ -3,8 +3,8 @@
# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
pkgname=deepin-daemon
-pkgver=5.11.0.36
-pkgrel=2
+pkgver=5.11.0.41
+pkgrel=1
pkgdesc='Daemon handling the DDE session settings'
arch=('x86_64')
url="https://github.com/linuxdeepin/dde-daemon"
@@ -26,15 +26,15 @@
groups=('deepin')
install="$pkgname.install"
source=("https://github.com/linuxdeepin/dde-daemon/archive/$pkgver/$pkgname-$pkgver.tar.gz"
- dde-daemon_5.9.4.2.diff
+ $pkgname-fix-vanilla-libinput.patch
'deepin-daemon.sysusers')
-sha512sums=('d36e5629950ac76094da1c79bec1cfc19c2da61ac4adbd7f65ba925ade4162bcf44856e6876512b27b79bb799ad22d732e0078bf647c9e4ae178a88d545a70ac'
- '5329b86309dcdea88347b0ee8fbee04023328571479edc8e026ba78895deca59ca6195743f398b42a4b8fd9cfae3a0b7308ce8fff9a50adf40011fd1bd8715ae'
+sha512sums=('a9beef57e985d0ae064ea37ae25a713843e604aa8b0bb630302a31237857d1d066ae2821b8698964e68e9f9a298cf38fede060d062619b6c019da5fba13905ee'
+ '944b0ae6cf7f613fd00884593c5e5f43aaf0efe4ea7aaa546a06b4367b8da4f2bc486dca640f77743bd1b7b9e4aacf741afe5c5e3ee219c2fdd4cc891ab3d367'
'808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
prepare() {
cd dde-daemon-$pkgver
- patch -p1 -i ../dde-daemon_5.9.4.2.diff
+ patch -p1 -i ../$pkgname-fix-vanilla-libinput.patch
export GOPATH="$srcdir/build:/usr/share/gocode"
Deleted: dde-daemon_5.9.4.2.diff
===================================================================
--- dde-daemon_5.9.4.2.diff 2020-12-28 13:20:40 UTC (rev 794899)
+++ dde-daemon_5.9.4.2.diff 2020-12-28 13:21:55 UTC (rev 794900)
@@ -1,34 +0,0 @@
-diff --git a/system/gesture/core.c b/system/gesture/core.c
-index f953cc1c..4a49749e 100644
---- a/system/gesture/core.c
-+++ b/system/gesture/core.c
-@@ -305,7 +305,7 @@ handle_gesture_events(struct libinput_event *ev, int type)
- }
- raw_event_reset(raw);
- break;
-- case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
-+ /*case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
- break;
- case LIBINPUT_EVENT_GESTURE_TAP_END:
- if (libinput_event_gesture_get_cancelled(gesture)) {
-@@ -314,7 +314,7 @@ handle_gesture_events(struct libinput_event *ev, int type)
- raw->fingers = libinput_event_gesture_get_finger_count(gesture);
- g_debug("[Tap] fingers: %d", raw->fingers);
- handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers);
-- break;
-+ break;*/
- }
- }
-
-@@ -433,9 +433,9 @@ handle_events(struct libinput *li)
- case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
- case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
- case LIBINPUT_EVENT_GESTURE_SWIPE_END:
-- case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
-+ /*case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
- case LIBINPUT_EVENT_GESTURE_TAP_UPDATE:
-- case LIBINPUT_EVENT_GESTURE_TAP_END:{
-+ case LIBINPUT_EVENT_GESTURE_TAP_END:*/{
- handle_gesture_events(ev, type);
- break;
- }
Copied: deepin-daemon/trunk/deepin-daemon-fix-vanilla-libinput.patch (from rev 794899, deepin-daemon/trunk/dde-daemon_5.9.4.2.diff)
===================================================================
--- deepin-daemon-fix-vanilla-libinput.patch (rev 0)
+++ deepin-daemon-fix-vanilla-libinput.patch 2020-12-28 13:21:55 UTC (rev 794900)
@@ -0,0 +1,59 @@
+diff --git a/system/gesture/core.c b/system/gesture/core.c
+index 85902af6..f9a02551 100644
+--- a/system/gesture/core.c
++++ b/system/gesture/core.c
+@@ -358,9 +358,7 @@ handle_gesture_events(struct libinput_event *ev, int type)
+ if (raw->dblclick
+ && type != LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN
+ && type != LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE
+- && type != LIBINPUT_EVENT_GESTURE_SWIPE_END
+- && type != LIBINPUT_EVENT_GESTURE_TAP_UPDATE
+- && type != LIBINPUT_EVENT_GESTURE_TAP_END) {
++ && type != LIBINPUT_EVENT_GESTURE_SWIPE_END) {
+ raw->fingers = libinput_event_gesture_get_finger_count(gesture);
+ handleSwipeStop(raw->fingers);
+ raw->dblclick = false;
+@@ -438,31 +436,6 @@ handle_gesture_events(struct libinput_event *ev, int type)
+
+ raw_event_reset(raw, true);
+ break;
+- case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
+- g_debug("[Tap begin] time: %u duration: %d fingers: %d \n", raw->t_start_tap, (libinput_event_gesture_get_time_usec(gesture) - raw->t_start_tap) / 1000, raw->fingers);
+- if (raw->t_start_tap > 0
+- && (libinput_event_gesture_get_time_usec(gesture) - raw->t_start_tap) / 1000 <= dblclick_duration
+- && raw->fingers == libinput_event_gesture_get_finger_count(gesture)) {
+- handleDbclickDown(raw->fingers);
+- handle_tap_stop();
+- raw_event_reset(raw, true);
+- raw->dblclick = true;
+- }
+- break;
+- case LIBINPUT_EVENT_GESTURE_TAP_END:
+- if (libinput_event_gesture_get_cancelled(gesture)) {
+- raw_event_reset(raw, true);
+- break;
+- }
+-
+- if (!raw->dblclick) {
+- raw->fingers = libinput_event_gesture_get_finger_count(gesture);
+- raw->t_start_tap = libinput_event_gesture_get_time_usec(gesture);
+- handle_tap_delay();
+- } else {
+- raw_event_reset(raw, true);
+- }
+- break;
+ }
+ }
+
+@@ -591,10 +564,7 @@ handle_events(struct libinput *li, struct movement *m)
+ case LIBINPUT_EVENT_GESTURE_PINCH_END:
+ case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
+ case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
+- case LIBINPUT_EVENT_GESTURE_SWIPE_END:
+- case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
+- case LIBINPUT_EVENT_GESTURE_TAP_UPDATE:
+- case LIBINPUT_EVENT_GESTURE_TAP_END:{
++ case LIBINPUT_EVENT_GESTURE_SWIPE_END:{
+ handle_gesture_events(ev, type);
+ break;
+ }
More information about the arch-commits
mailing list