[arch-commits] Commit in deepin-daemon/repos/community-x86_64 (8 files)

Felix Yan felixonmars at archlinux.org
Sun Jul 26 05:17:48 UTC 2020


    Date: Sunday, July 26, 2020 @ 05:17:48
  Author: felixonmars
Revision: 665316

archrelease: copy trunk to community-x86_64

Added:
  deepin-daemon/repos/community-x86_64/PKGBUILD
    (from rev 665315, deepin-daemon/trunk/PKGBUILD)
  deepin-daemon/repos/community-x86_64/dde-daemon_5.9.4.2.diff
    (from rev 665315, deepin-daemon/trunk/dde-daemon_5.9.4.2.diff)
  deepin-daemon/repos/community-x86_64/deepin-daemon.install
    (from rev 665315, deepin-daemon/trunk/deepin-daemon.install)
  deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers
    (from rev 665315, deepin-daemon/trunk/deepin-daemon.sysusers)
Deleted:
  deepin-daemon/repos/community-x86_64/PKGBUILD
  deepin-daemon/repos/community-x86_64/dde-daemon_5.9.4.2.diff
  deepin-daemon/repos/community-x86_64/deepin-daemon.install
  deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers

-------------------------+
 PKGBUILD                |  144 +++++++++++++++++++++++-----------------------
 dde-daemon_5.9.4.2.diff |  108 +++++++++++++++++-----------------
 deepin-daemon.install   |    6 -
 deepin-daemon.sysusers  |    4 -
 4 files changed, 131 insertions(+), 131 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-26 05:17:23 UTC (rev 665315)
+++ PKGBUILD	2020-07-26 05:17:48 UTC (rev 665316)
@@ -1,72 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-daemon
-pkgver=5.11.0.19
-pkgrel=1
-pkgdesc='Daemon handling the DDE session settings'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/dde-daemon"
-license=('GPL3')
-depends=('deepin-desktop-schemas' 'ddcutil' 'deepin-api' 'gvfs' 'iso-codes' 'lsb-release'
-         'mobile-broadband-provider-info' 'deepin-polkit-agent'
-         'deepin-polkit-agent-ext-gnomekeyring' 'udisks2' 'upower'
-         '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' 'golang-gopkg-yaml.v2' 'sqlite' 'deepin-gettext-tools'
-             'git' 'mercurial' 'python-gobject' 'networkmanager' 'bluez' 'go')
-optdepends=('networkmanager: for network management support'
-            'bluez: for bluetooth support'
-            'iw: for miracast module'
-            'proxychains-ng: for proxy configuration module')
-conflicts=('dde-daemon')
-replaces=('dde-daemon')
-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
-        'deepin-daemon.sysusers')
-sha512sums=('aa92d1819bc16415bc11866150d211f1f4b092b535d4e3144cbc973c421e97afa1424847a0b40eebf06ed62dd084de6e62b617330f64e7f9be03b45913d696d9'
-            '188bb74fc4deddd2d9cbc210ec487b45664178524294d9a98e47cd4c8a70e369fd3441697bc50b696a975cfbbbfa16666d1798b1ae25469abee50eb84e4bef27'
-            '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
-
-prepare() {
-  cd dde-daemon-$pkgver
-  patch -p1 -i ../dde-daemon_5.9.4.2.diff
-
-  export GOPATH="$srcdir/build:/usr/share/gocode"
-
-  # golang-deepin-lib's dependency, remove when go packaging resumes
-  go get github.com/cryptix/wav
-
-  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
-}
-
-build() {
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-
-  cd dde-daemon-$pkgver
-  make -C network/nm_generator gen-nm-code
-  make
-}
-
-package() {
-  cd dde-daemon-$pkgver
-  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"
-}

Copied: deepin-daemon/repos/community-x86_64/PKGBUILD (from rev 665315, deepin-daemon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-26 05:17:48 UTC (rev 665316)
@@ -0,0 +1,72 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-daemon
+pkgver=5.11.0.20
+pkgrel=1
+pkgdesc='Daemon handling the DDE session settings'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/dde-daemon"
+license=('GPL3')
+depends=('deepin-desktop-schemas' 'ddcutil' 'deepin-api' 'gvfs' 'iso-codes' 'lsb-release'
+         'mobile-broadband-provider-info' 'deepin-polkit-agent'
+         'deepin-polkit-agent-ext-gnomekeyring' 'udisks2' 'upower'
+         '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' 'golang-gopkg-yaml.v2' 'sqlite' 'deepin-gettext-tools'
+             'git' 'mercurial' 'python-gobject' 'networkmanager' 'bluez' 'go')
+optdepends=('networkmanager: for network management support'
+            'bluez: for bluetooth support'
+            'iw: for miracast module'
+            'proxychains-ng: for proxy configuration module')
+conflicts=('dde-daemon')
+replaces=('dde-daemon')
+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
+        'deepin-daemon.sysusers')
+sha512sums=('849dea8f94ddf2d0d0fc448135dc9f1fb278c7e511587fcd7e2324cded7ca6c9f80aca48aee66e0e2f2b84ce0cb02c74337cb6767973efd58dcf69245ffd049e'
+            '188bb74fc4deddd2d9cbc210ec487b45664178524294d9a98e47cd4c8a70e369fd3441697bc50b696a975cfbbbfa16666d1798b1ae25469abee50eb84e4bef27'
+            '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
+
+prepare() {
+  cd dde-daemon-$pkgver
+  patch -p1 -i ../dde-daemon_5.9.4.2.diff
+
+  export GOPATH="$srcdir/build:/usr/share/gocode"
+
+  # golang-deepin-lib's dependency, remove when go packaging resumes
+  go get github.com/cryptix/wav
+
+  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
+}
+
+build() {
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+
+  cd dde-daemon-$pkgver
+  make -C network/nm_generator gen-nm-code
+  make
+}
+
+package() {
+  cd dde-daemon-$pkgver
+  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"
+}

Deleted: dde-daemon_5.9.4.2.diff
===================================================================
--- dde-daemon_5.9.4.2.diff	2020-07-26 05:17:23 UTC (rev 665315)
+++ dde-daemon_5.9.4.2.diff	2020-07-26 05:17:48 UTC (rev 665316)
@@ -1,54 +0,0 @@
-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;
-         }

Copied: deepin-daemon/repos/community-x86_64/dde-daemon_5.9.4.2.diff (from rev 665315, deepin-daemon/trunk/dde-daemon_5.9.4.2.diff)
===================================================================
--- dde-daemon_5.9.4.2.diff	                        (rev 0)
+++ dde-daemon_5.9.4.2.diff	2020-07-26 05:17:48 UTC (rev 665316)
@@ -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;
+         }

Deleted: deepin-daemon.install
===================================================================
--- deepin-daemon.install	2020-07-26 05:17:23 UTC (rev 665315)
+++ deepin-daemon.install	2020-07-26 05:17:48 UTC (rev 665316)
@@ -1,3 +0,0 @@
-post_remove() {
-  rm -f /var/cache/deepin/mark-setup-network-services
-}

Copied: deepin-daemon/repos/community-x86_64/deepin-daemon.install (from rev 665315, deepin-daemon/trunk/deepin-daemon.install)
===================================================================
--- deepin-daemon.install	                        (rev 0)
+++ deepin-daemon.install	2020-07-26 05:17:48 UTC (rev 665316)
@@ -0,0 +1,3 @@
+post_remove() {
+  rm -f /var/cache/deepin/mark-setup-network-services
+}

Deleted: deepin-daemon.sysusers
===================================================================
--- deepin-daemon.sysusers	2020-07-26 05:17:23 UTC (rev 665315)
+++ deepin-daemon.sysusers	2020-07-26 05:17:48 UTC (rev 665316)
@@ -1,2 +0,0 @@
-u deepin-daemon - "Deepin Daemon"
-g deepin-daemon -

Copied: deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers (from rev 665315, deepin-daemon/trunk/deepin-daemon.sysusers)
===================================================================
--- deepin-daemon.sysusers	                        (rev 0)
+++ deepin-daemon.sysusers	2020-07-26 05:17:48 UTC (rev 665316)
@@ -0,0 +1,2 @@
+u deepin-daemon - "Deepin Daemon"
+g deepin-daemon -


More information about the arch-commits mailing list