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

Felix Yan felixonmars at archlinux.org
Wed Feb 24 21:35:57 UTC 2021


    Date: Wednesday, February 24, 2021 @ 21:35:57
  Author: felixonmars
Revision: 871990

archrelease: copy trunk to community-x86_64

Added:
  deepin-daemon/repos/community-x86_64/PKGBUILD
    (from rev 871989, deepin-daemon/trunk/PKGBUILD)
  deepin-daemon/repos/community-x86_64/deepin-daemon-fix-vanilla-libinput.patch
    (from rev 871989, deepin-daemon/trunk/deepin-daemon-fix-vanilla-libinput.patch)
  deepin-daemon/repos/community-x86_64/deepin-daemon.install
    (from rev 871989, deepin-daemon/trunk/deepin-daemon.install)
  deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers
    (from rev 871989, deepin-daemon/trunk/deepin-daemon.sysusers)
Deleted:
  deepin-daemon/repos/community-x86_64/PKGBUILD
  deepin-daemon/repos/community-x86_64/deepin-daemon-fix-vanilla-libinput.patch
  deepin-daemon/repos/community-x86_64/deepin-daemon.install
  deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers

------------------------------------------+
 PKGBUILD                                 |  150 ++++++++++++++---------------
 deepin-daemon-fix-vanilla-libinput.patch |  118 +++++++++++-----------
 deepin-daemon.install                    |    6 -
 deepin-daemon.sysusers                   |    4 
 4 files changed, 139 insertions(+), 139 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-24 21:35:38 UTC (rev 871989)
+++ PKGBUILD	2021-02-24 21:35:57 UTC (rev 871990)
@@ -1,75 +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.12.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"
-        $pkgname-fix-vanilla-libinput.patch
-        'deepin-daemon.sysusers')
-sha512sums=('815fe5b2a3b04cbb797805da74b612cb4c7b7c0089ec4bdc370636b303c8294be452e5e6b75bde2972ea8472a45d22b25d35d153cc3ff5d5a34b3274699f0eab'
-            '944b0ae6cf7f613fd00884593c5e5f43aaf0efe4ea7aaa546a06b4367b8da4f2bc486dca640f77743bd1b7b9e4aacf741afe5c5e3ee219c2fdd4cc891ab3d367'
-            '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
-
-export GO111MODULE=auto
-
-prepare() {
-  cd dde-daemon-$pkgver
-  patch -p1 -i ../$pkgname-fix-vanilla-libinput.patch
-
-  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 github.com/fsnotify/fsnotify github.com/godbus/dbus
-
-  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 871989, deepin-daemon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-02-24 21:35:57 UTC (rev 871990)
@@ -0,0 +1,75 @@
+# 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.12.0.21
+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"
+        $pkgname-fix-vanilla-libinput.patch
+        'deepin-daemon.sysusers')
+sha512sums=('3823d56ecf7caa4d1a9b1fe77af97232a804dddb2d2a4e6e7ca56261073a0aa2ab850704596af4001fe397917a6cef276602ec7ed1affa12d838f28f91776b41'
+            '944b0ae6cf7f613fd00884593c5e5f43aaf0efe4ea7aaa546a06b4367b8da4f2bc486dca640f77743bd1b7b9e4aacf741afe5c5e3ee219c2fdd4cc891ab3d367'
+            '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
+
+export GO111MODULE=auto
+
+prepare() {
+  cd dde-daemon-$pkgver
+  patch -p1 -i ../$pkgname-fix-vanilla-libinput.patch
+
+  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 github.com/fsnotify/fsnotify github.com/godbus/dbus
+
+  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: deepin-daemon-fix-vanilla-libinput.patch
===================================================================
--- deepin-daemon-fix-vanilla-libinput.patch	2021-02-24 21:35:38 UTC (rev 871989)
+++ deepin-daemon-fix-vanilla-libinput.patch	2021-02-24 21:35:57 UTC (rev 871990)
@@ -1,59 +0,0 @@
-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;
-         }

Copied: deepin-daemon/repos/community-x86_64/deepin-daemon-fix-vanilla-libinput.patch (from rev 871989, deepin-daemon/trunk/deepin-daemon-fix-vanilla-libinput.patch)
===================================================================
--- deepin-daemon-fix-vanilla-libinput.patch	                        (rev 0)
+++ deepin-daemon-fix-vanilla-libinput.patch	2021-02-24 21:35:57 UTC (rev 871990)
@@ -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;
+         }

Deleted: deepin-daemon.install
===================================================================
--- deepin-daemon.install	2021-02-24 21:35:38 UTC (rev 871989)
+++ deepin-daemon.install	2021-02-24 21:35:57 UTC (rev 871990)
@@ -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 871989, deepin-daemon/trunk/deepin-daemon.install)
===================================================================
--- deepin-daemon.install	                        (rev 0)
+++ deepin-daemon.install	2021-02-24 21:35:57 UTC (rev 871990)
@@ -0,0 +1,3 @@
+post_remove() {
+  rm -f /var/cache/deepin/mark-setup-network-services
+}

Deleted: deepin-daemon.sysusers
===================================================================
--- deepin-daemon.sysusers	2021-02-24 21:35:38 UTC (rev 871989)
+++ deepin-daemon.sysusers	2021-02-24 21:35:57 UTC (rev 871990)
@@ -1,2 +0,0 @@
-u deepin-daemon - "Deepin Daemon"
-g deepin-daemon -

Copied: deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers (from rev 871989, deepin-daemon/trunk/deepin-daemon.sysusers)
===================================================================
--- deepin-daemon.sysusers	                        (rev 0)
+++ deepin-daemon.sysusers	2021-02-24 21:35:57 UTC (rev 871990)
@@ -0,0 +1,2 @@
+u deepin-daemon - "Deepin Daemon"
+g deepin-daemon -


More information about the arch-commits mailing list