diff --git a/.gitignore b/.gitignore index 9ae2918..add52c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /dde-daemon-3.1.19.tar.gz /default-settings-2016.9.8.tar.gz /dde-daemon-3.2.0.tar.gz +/dde-daemon-3.2.7.tar.gz diff --git a/README.md b/README.md new file mode 100644 index 0000000..24399a4 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# deepin-daemon + +The deepin-daemon package diff --git a/dde-daemon_3.2.3.patch b/dde-daemon_3.2.3.patch new file mode 100644 index 0000000..7dcb3b6 --- /dev/null +++ b/dde-daemon_3.2.3.patch @@ -0,0 +1,116 @@ +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/deepin-daemon.spec b/deepin-daemon.spec index e2a3bba..bb3ed4d 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -2,7 +2,7 @@ %global ds_url https://github.com/linuxdeepin/default-settings Name: deepin-daemon -Version: 3.2.0 +Version: 3.2.7 Release: 1%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 @@ -10,14 +10,16 @@ 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 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # https://github.com/golang/go/issues/21947 ExcludeArch: ppc64le BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -BuildRequires: gettext +BuildRequires: deepin-gettext-tools BuildRequires: deepin-gir-generator BuildRequires: fontpackages-devel +BuildRequires: librsvg2-tools BuildRequires: pam-devel BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gnome-keyring-1) @@ -26,6 +28,8 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(libbamf3) BuildRequires: pkgconfig(libcanberra) +BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(libnl-genl-3.0) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libudev) @@ -82,6 +86,7 @@ Daemon handling the DDE session settings %prep %setup -q -a1 -n %{repo}-%{version} +%patch0 -p1 -b dde-daemon-3.2.3 # Fix library exec path sed -i '/deepin/s|lib|libexec|; /ldflags/d' Makefile @@ -160,6 +165,7 @@ fi %{_datadir}/dbus-1/services/*.service %{_datadir}/dbus-1/system-services/*.service %{_datadir}/dbus-1/system.d/*.conf +%{_datadir}/icons/hicolor/*/status/* %{_datadir}/%{repo}/ %{_datadir}/dde/ %{_datadir}/polkit-1/actions/*.policy @@ -169,6 +175,12 @@ fi %{_var}/cache/appearance/ %changelog +* Mon Nov 27 2017 mosquito - 3.2.7-1 +- Update to 3.2.7 + +* Fri Oct 27 2017 mosquito - 3.2.2-1 +- Update to 3.2.2 + * Sat Oct 14 2017 mosquito - 3.2.0-1 - Update to 3.2.0 diff --git a/sources b/sources index f4573c1..dfc1d27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dde-daemon-3.2.0.tar.gz) = 315c217b4fefe62b49578dc82164a6abef4a5f9ae947525dec2e0a9581317e00594cc9e9441833f5f658a1527fe1fe4e51282ae3651bc7e09f06d06e2dcad697 +SHA512 (dde-daemon-3.2.7.tar.gz) = f408737bb420a8de57ac45940f3607b1a5bb48f7bedf2be8a7a3fa9b6fd4839d4c38b6d7ecf6ba86b394197dc757f70c7e31b7cb65b37dae7297979dcdadf2fe SHA512 (default-settings-2016.9.8.tar.gz) = 174875142f049ed270a15e4334d9afa59275aa8db84cb15942905a17f2733555fd3e8ae4557c6caeab0bde00bcd606f294d058d0a8d7f584d54a168512b117f5