diff --git a/.gitignore b/.gitignore index 8ccd198..49d2d6d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /dde-daemon-3.2.22.tar.gz /dde-daemon-3.2.20.tar.gz /dde-daemon-3.7.0.tar.gz +/dde-daemon-3.9.0.tar.gz diff --git a/dde-daemon_3.2.3.patch b/dde-daemon_3.2.3.patch deleted file mode 100644 index 7dcb3b6..0000000 --- a/dde-daemon_3.2.3.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff --git a/misc/dde-daemon/gesture.json b/misc/dde-daemon/gesture.json -index 2fc0ce60..9548d8f2 100644 ---- a/misc/dde-daemon/gesture.json -+++ b/misc/dde-daemon/gesture.json -@@ -53,15 +53,6 @@ - "Action": "ShowWindow" - } - }, -- { -- "Name": "tap", -- "Direction": "none", -- "Fingers": 3, -- "Action": { -- "Type": "built-in", -- "Action": "MoveWindow" -- } -- }, - { - "Name": "swipe", - "Direction": "up", -diff --git a/system/gesture/core.c b/system/gesture/core.c -index a54190b6..085b5f7c 100644 ---- a/system/gesture/core.c -+++ b/system/gesture/core.c -@@ -211,16 +211,16 @@ handle_gesture_events(struct libinput_event *ev, int type) - } - raw_event_reset(raw); - break; -- case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: -- break; -- case LIBINPUT_EVENT_GESTURE_TAP_END: -- if (libinput_event_gesture_get_cancelled(gesture)) { -- break; -- } -- raw->fingers = libinput_event_gesture_get_finger_count(gesture); -- printf("[Tap] fingers: %d\n", raw->fingers); -- handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers); -- break; -+ /* case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: */ -+ /* break; */ -+ /* case LIBINPUT_EVENT_GESTURE_TAP_END: */ -+ /* if (libinput_event_gesture_get_cancelled(gesture)) { */ -+ /* break; */ -+ /* } */ -+ /* raw->fingers = libinput_event_gesture_get_finger_count(gesture); */ -+ /* printf("[Tap] fingers: %d\n", raw->fingers); */ -+ /* handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers); */ -+ /* break; */ - } - } - -@@ -279,12 +279,12 @@ handle_events(struct libinput *li) - case LIBINPUT_EVENT_GESTURE_PINCH_BEGIN: - case LIBINPUT_EVENT_GESTURE_PINCH_UPDATE: - case LIBINPUT_EVENT_GESTURE_PINCH_END: -+ /* case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: */ -+ /* case LIBINPUT_EVENT_GESTURE_TAP_UPDATE: */ -+ /* case LIBINPUT_EVENT_GESTURE_TAP_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; - } -diff --git a/system/gesture/core.h b/system/gesture/core.h -index 78bffce2..cca771b6 100644 ---- a/system/gesture/core.h -+++ b/system/gesture/core.h -@@ -22,10 +22,10 @@ - - #define GESTURE_TYPE_SWIPE 100 - #define GESTURE_TYPE_PINCH 101 --#define GESTURE_TYPE_TAP 102 -+/* #define GESTURE_TYPE_TAP 102 */ - - // tap --#define GESTURE_DIRECTION_NONE 0 -+/* #define GESTURE_DIRECTION_NONE 0 */ - // swipe - #define GESTURE_DIRECTION_UP 10 - #define GESTURE_DIRECTION_DOWN 11 -diff --git a/system/gesture/gesture.go b/system/gesture/gesture.go -index adb06d40..dd1e485c 100644 ---- a/system/gesture/gesture.go -+++ b/system/gesture/gesture.go -@@ -42,9 +42,9 @@ type GestureType int32 - var ( - GestureTypeSwipe = GestureType(C.GESTURE_TYPE_SWIPE) - GestureTypePinch = GestureType(C.GESTURE_TYPE_PINCH) -- GestureTypeTap = GestureType(C.GESTURE_TYPE_TAP) -+ // GestureTypeTap = GestureType(C.GESTURE_TYPE_TAP) - -- GestureDirectionNone = GestureType(C.GESTURE_DIRECTION_NONE) -+ // GestureDirectionNone = GestureType(C.GESTURE_DIRECTION_NONE) - GestureDirectionUp = GestureType(C.GESTURE_DIRECTION_UP) - GestureDirectionDown = GestureType(C.GESTURE_DIRECTION_DOWN) - GestureDirectionLeft = GestureType(C.GESTURE_DIRECTION_LEFT) -@@ -59,10 +59,10 @@ func (t GestureType) String() string { - return "swipe" - case GestureTypePinch: - return "pinch" -- case GestureTypeTap: -- return "tap" -- case GestureDirectionNone: -- return "none" -+ // case GestureTypeTap: -+ // return "tap" -+ // case GestureDirectionNone: -+ // return "none" - case GestureDirectionUp: - return "up" - case GestureDirectionDown: diff --git a/dde-daemon_3.8.0.patch b/dde-daemon_3.8.0.patch new file mode 100644 index 0000000..dfbc459 --- /dev/null +++ b/dde-daemon_3.8.0.patch @@ -0,0 +1,66 @@ +diff --git a/misc/dde-daemon/gesture.json b/misc/dde-daemon/gesture.json +index 2fc0ce60..9548d8f2 100644 +--- a/misc/dde-daemon/gesture.json ++++ b/misc/dde-daemon/gesture.json +@@ -53,15 +53,6 @@ + "Action": "ShowWindow" + } + }, +- { +- "Name": "tap", +- "Direction": "none", +- "Fingers": 3, +- "Action": { +- "Type": "built-in", +- "Action": "MoveWindow" +- } +- }, + { + "Name": "swipe", + "Direction": "up", +diff --git a/system/gesture/core.c b/system/gesture/core.c +index 750baabb..066c4fd9 100644 +--- a/system/gesture/core.c ++++ b/system/gesture/core.c +@@ -294,16 +294,16 @@ handle_gesture_events(struct libinput_event *ev, int type) + } + raw_event_reset(raw); + break; +- case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: +- break; +- case LIBINPUT_EVENT_GESTURE_TAP_END: +- if (libinput_event_gesture_get_cancelled(gesture)) { +- break; +- } +- 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; ++ /*case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:*/ ++ /*break;*/ ++ /*case LIBINPUT_EVENT_GESTURE_TAP_END:*/ ++ /*if (libinput_event_gesture_get_cancelled(gesture)) {*/ ++ /*break;*/ ++ /*}*/ ++ /*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;*/ + } + } + +@@ -410,10 +410,10 @@ handle_events(struct libinput *li) + 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:{ ++ /*case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:*/ ++ /*case LIBINPUT_EVENT_GESTURE_TAP_UPDATE:*/ ++ /*case LIBINPUT_EVENT_GESTURE_TAP_END:{*/ + handle_gesture_events(ev, type); + break; + } diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 8e36659..064a7cc 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -2,15 +2,15 @@ %global ds_url https://github.com/linuxdeepin/default-settings Name: deepin-daemon -Version: 3.7.0 -Release: 3%{?dist} +Version: 3.9.0 +Release: 1%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 URL: https://github.com/linuxdeepin/dde-daemon Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz Source1: %{ds_url}/archive/2016.9.8/default-settings-2016.9.8.tar.gz Source2: deepin-daemon.sysusers -Patch0: https://raw.github.com/jouyouyun/tap-gesture-patches/master/patches/dde-daemon_3.2.3.patch +Patch0: https://raw.github.com/jouyouyun/tap-gesture-patches/master/patches/dde-daemon_3.8.0.patch ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -91,7 +91,7 @@ Daemon handling the DDE session settings %prep %setup -q -a1 -n %{repo}-%{version} -%patch0 -p1 -b dde-daemon-3.2.3 +%patch0 -p1 -b dde-daemon-3.8.0 # Fix library exec path sed -i '/deepin/s|lib|libexec|' Makefile @@ -216,6 +216,9 @@ fi %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla %changelog +* Thu Nov 29 2018 mosquito - 3.9.0-1 +- Update to 3.9.0 + * Wed Nov 21 2018 mosquito - 3.7.0-3 - acpid is unavailable in ppc64le diff --git a/sources b/sources index 3ee2249..999d25e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dde-daemon-3.7.0.tar.gz) = ef199d7fdd5732dc46d0e3e22df86f2032011ff7ef508d8d63d7eb2589909048459eb0b70ac5357697e20c2878865886c8ab0c1725eaf7fd662925db8328b2e2 +SHA512 (dde-daemon-3.9.0.tar.gz) = d85531c4758e4c0754c6cafdb2d8a65cc4c64731a68a1195d1ff7b9a7231e9002f7238e4d4c4906b747eb89d262075b6646842aae81285042ccc230ebc75a0c5 SHA512 (default-settings-2016.9.8.tar.gz) = 174875142f049ed270a15e4334d9afa59275aa8db84cb15942905a17f2733555fd3e8ae4557c6caeab0bde00bcd606f294d058d0a8d7f584d54a168512b117f5