[arch-commits] Commit in deepin-daemon/trunk (PKGBUILD dde-daemon_5.9.4.2.diff)

[Felix Yan]

    Date: Friday, May 1, 2020 @ 14:53:10
  Author: felixonmars
Revision: 623863

upgpkg: deepin-daemon 5.9.4.2-1

Added:
  deepin-daemon/trunk/dde-daemon_5.9.4.2.diff
Modified:
  deepin-daemon/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   19 +++++++++-------
 dde-daemon_5.9.4.2.diff |   54 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-01 14:52:48 UTC (rev 623862)
+++ PKGBUILD	2020-05-01 14:53:10 UTC (rev 623863)
@@ -3,8 +3,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-daemon
-pkgver=5.0.0
-pkgrel=4
+pkgver=5.9.4.2
+pkgrel=1
 pkgdesc='Daemon handling the DDE session settings'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-daemon"
@@ -15,7 +15,7 @@
          'libxkbfile' 'accountsservice' 'deepin-desktop-base' 'bamf' 'pulseaudio'
          'org.freedesktop.secrets' 'noto-fonts' 'imwheel')
 makedepends=('golang-github-linuxdeepin-go-dbus-factory' 'golang-deepin-gir' 'golang-deepin-lib'
-             'golang-deepin-dde-api' 'golang-github-nfnt-resize' 'sqlite' 'deepin-gettext-tools'
+             'golang-deepin-dde-api' 'golang-github-nfnt-resize' 'golang-gopkg-yaml.v2' 'sqlite' 'deepin-gettext-tools'
              'git' 'mercurial' 'python-gobject' 'networkmanager' 'bluez' 'go-pie')
 optdepends=('networkmanager: for network management support'
             'bluez: for bluetooth support'
@@ -26,15 +26,15 @@
 groups=('deepin')
 install="${pkgname}.install"
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-daemon/archive/$pkgver.tar.gz"
-        https://raw.githubusercontent.com/jouyouyun/tap-gesture-patches/master/patches/dde-daemon_3.8.0.patch
+        dde-daemon_5.9.4.2.diff
         'deepin-daemon.sysusers')
-sha512sums=('b0247fb8e529bac387b1ce53a448eb8078cb4b2c2dee01b9388d344b366b67abb981efc43bfdd65ff0a91102009feee3f48bc5c7af689a85f30a33a96e3d7a3b'
-            '334839a8136cad44aadb4c97be29ae89f8a1106928175b9bd9115051b34d52cb468902636a67bae8685888bdfe8d8ae195cf8df2b9e93e480f3f008494942e74'
+sha512sums=('2ccea8ab03ac1760a9521bb5d230d93946139ce9dc5ffd3357a5d194a13b127a90c6f5b32c34b1212f82f1f0dc9c82cd8f75dd852789cb6e3d745d29e460cd6f'
+            '188bb74fc4deddd2d9cbc210ec487b45664178524294d9a98e47cd4c8a70e369fd3441697bc50b696a975cfbbbfa16666d1798b1ae25469abee50eb84e4bef27'
             '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
 
 prepare() {
   cd dde-daemon-$pkgver
-  patch -p1 -i ../dde-daemon_3.8.0.patch
+  patch -p1 -i ../dde-daemon_5.9.4.2.diff
 
   export GOPATH="$srcdir/build:/usr/share/gocode"
 
@@ -41,7 +41,9 @@
   # golang-deepin-lib's dependency, remove when go packaging resumes
   go get github.com/cryptix/wav
 
-  go get gopkg.in/yaml.v2 github.com/axgle/mahonia github.com/msteinert/pam github.com/gosexy/gettext
+  go get github.com/axgle/mahonia github.com/msteinert/pam github.com/gosexy/gettext github.com/rickb777/date \
+         github.com/jinzhu/gorm github.com/kelvins/sunrisesunset github.com/mozillazg/go-pinyin github.com/teambition/rrule-go \
+         golang.org/x/xerrors github.com/mattn/go-sqlite3
 
   sed -i 's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#' accounts/user.go
 }
@@ -57,6 +59,7 @@
   make DESTDIR="$pkgdir" PAM_MODULE_DIR=usr/lib/security install
 
   mv "$pkgdir"{,/usr}/lib/systemd
+  mv "$pkgdir"{,/usr}/lib/udev
   rmdir "$pkgdir"/lib
 
   install -Dm644 ../deepin-daemon.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf"

Added: dde-daemon_5.9.4.2.diff
===================================================================
--- dde-daemon_5.9.4.2.diff	                        (rev 0)
+++ dde-daemon_5.9.4.2.diff	2020-05-01 14:53:10 UTC (rev 623863)
@@ -0,0 +1,54 @@
+diff --git a/misc/dde-daemon/gesture.json b/misc/dde-daemon/gesture.json
+index 73a3d7ee..fbcc8fd8 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 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;
+         }