Date: Monday, December 26, 2022 @ 20:57:34
Author: felixonmars
Revision: 1368522
archrelease: copy trunk to community-x86_64
Added:
deepin-daemon/repos/community-x86_64/PKGBUILD
(from rev 1368521, deepin-daemon/trunk/PKGBUILD)
deepin-daemon/repos/community-x86_64/deepin-daemon-fix-vanilla-libinput.patch
(from rev 1368521,
deepin-daemon/trunk/deepin-daemon-fix-vanilla-libinput.patch)
deepin-daemon/repos/community-x86_64/deepin-daemon.install
(from rev 1368521, deepin-daemon/trunk/deepin-daemon.install)
deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers
(from rev 1368521, 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
deepin-daemon/repos/community-x86_64/godbus.patch
------------------------------------------+
PKGBUILD | 231 ++++++++++++++---------------
deepin-daemon-fix-vanilla-libinput.patch | 118 +++++++-------
deepin-daemon.install | 6
deepin-daemon.sysusers | 4
godbus.patch | 12 -
5 files changed, 178 insertions(+), 193 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-26 20:57:19 UTC (rev 1368521)
+++ PKGBUILD 2022-12-26 20:57:34 UTC (rev 1368522)
@@ -1,117 +0,0 @@
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-daemon
-pkgver=5.14.106
-pkgrel=2
-pkgdesc='Daemon handling the DDE session settings'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/dde-daemon";
-license=('GPL3')
-depends=('deepin-desktop-schemas' 'deepin-api' 'deepin-app-services'
- # TODO:
- 'iso-codes'
- # accounts
- 'accountsservice'
- # accounts/grub
- 'deepin-polkit-agent' 'deepin-polkit-agent-ext-gnomekeyring'
- # accounts/keybinding/systeminfo
- 'deepin-desktop-base'
- # appearance
- 'fontconfig' 'noto-fonts'
- # audio/session
- 'pulseaudio'
- # bin/backlight_helper
- 'ddcutil'
- # clipboard
- 'libxfixes'
- # dock
- 'bamf'
- # image_effect
- 'deepin-session-ui' 'sudo'
- # inputdevices
- 'imwheel' 'libxkbfile' 'procps-ng' 'psmisc'
- # iw
- 'libnl'
- # keybinding
- 'gvfs'
- # misc
- 'librsvg'
- # network
- 'mobile-broadband-provider-info' 'org.freedesktop.secrets' 'xdg-utils'
- # network/system
- 'systemd'
- # system
- 'dmidecode' 'libinput' 'lshw' 'upower'
- # systeminfo
- 'lsb-release' 'udisks2' 'util-linux')
-makedepends=('golang-github-linuxdeepin-go-dbus-factory' 'golang-deepin-gir'
'golang-deepin-lib'
- 'golang-deepin-dde-api' 'golang-github-nfnt-resize'
'golang-gopkg-yaml.v3' 'sqlite'
- 'deepin-gettext-tools' 'golang-github-fsnotify-fsnotify'
'golang-github-stretchr-testify'
- '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 godbus.patch
- 'deepin-daemon.sysusers')
-sha512sums=('9fef0f76d36dde9db9dbae61190040b6d9178e1c1fd4ade20ff340d502a630bbe7f43a407ef61b8a8500269b43cffec5f173a4ede6461319d29f8bb3f2e61b46'
-
'944b0ae6cf7f613fd00884593c5e5f43aaf0efe4ea7aaa546a06b4367b8da4f2bc486dca640f77743bd1b7b9e4aacf741afe5c5e3ee219c2fdd4cc891ab3d367'
-
'4ba37f25efe423b4af18ee03682cd85d56314cda3dc8f63ac2f8f819723a5ff54947ec2a11999d54ab58f1d2dc2309aa4f23f983f98d89e96b6f34e3f0593f9e'
-
'808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
-
-export GO111MODULE=off
-
-prepare() {
- cd dde-daemon-$pkgver
- patch -p1 -i ../$pkgname-fix-vanilla-libinput.patch
-
- export GOPATH="$srcdir/build:/usr/share/gocode"
-
- go get github.com/cryptix/wav 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/godbus/dbus google.golang.org/protobuf/proto \
- github.com/Lofanmi/pinyin-golang/pinyin github.com/youpy/go-wav
github.com/mdlayher/netlink
-
- (cd "$srcdir"/build/src/github.com/godbus/dbus && patch -p1 -i
"$srcdir"/godbus.patch)
-
- sed -i
's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#'
accounts/user.go
-
- # https://github.com/linuxdeepin/developer-center/discussions/3327
- sed -i 's#/usr/libexec#/usr/lib#' keybinding/shortcuts/system_shortcut.go
- sed -i 's#${PREFIX}/libexec/#${PREFIX}/lib/#' Makefile
-
- sed -i 's|"gopkg.in/yaml.v2"|"gopkg.in/yaml.v3"|'
network/nm_generator/utils.go
-
- sed -i 's|/etc/os-version|/etc/uos-version|'
keybinding/shortcuts/shortcut_manager.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 1368521,
deepin-daemon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-12-26 20:57:34 UTC (rev 1368522)
@@ -0,0 +1,114 @@
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-daemon
+pkgver=5.14.107
+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' 'deepin-api' 'deepin-app-services'
+ # TODO:
+ 'iso-codes'
+ # accounts
+ 'accountsservice'
+ # accounts/grub
+ 'deepin-polkit-agent' 'deepin-polkit-agent-ext-gnomekeyring'
+ # accounts/keybinding/systeminfo
+ 'deepin-desktop-base'
+ # appearance
+ 'fontconfig' 'noto-fonts'
+ # audio/session
+ 'pulseaudio'
+ # bin/backlight_helper
+ 'ddcutil'
+ # clipboard
+ 'libxfixes'
+ # dock
+ 'bamf'
+ # image_effect
+ 'deepin-session-ui' 'sudo'
+ # inputdevices
+ 'imwheel' 'libxkbfile' 'procps-ng' 'psmisc'
+ # iw
+ 'libnl'
+ # keybinding
+ 'gvfs'
+ # misc
+ 'librsvg'
+ # network
+ 'mobile-broadband-provider-info' 'org.freedesktop.secrets' 'xdg-utils'
+ # network/system
+ 'systemd'
+ # system
+ 'dmidecode' 'libinput' 'lshw' 'upower'
+ # systeminfo
+ 'lsb-release' 'udisks2' 'util-linux')
+makedepends=('golang-github-linuxdeepin-go-dbus-factory' 'golang-deepin-gir'
'golang-deepin-lib'
+ 'golang-deepin-dde-api' 'golang-github-nfnt-resize'
'golang-gopkg-yaml.v3' 'sqlite'
+ 'deepin-gettext-tools' 'golang-github-fsnotify-fsnotify'
'golang-github-stretchr-testify'
+ '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=('8f72b991ee697d322e85ce728571329f45d774cffe14250ee4a30476e9f6ddb45b8433a3f958122df3078e85b6aad631bb96964ee93d76ee0ff3909f04e5ae2e'
+
'944b0ae6cf7f613fd00884593c5e5f43aaf0efe4ea7aaa546a06b4367b8da4f2bc486dca640f77743bd1b7b9e4aacf741afe5c5e3ee219c2fdd4cc891ab3d367'
+
'808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
+
+export GO111MODULE=off
+
+prepare() {
+ cd dde-daemon-$pkgver
+ patch -p1 -i ../$pkgname-fix-vanilla-libinput.patch
+
+ export GOPATH="$srcdir/build:/usr/share/gocode"
+
+ go get github.com/cryptix/wav 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/godbus/dbus google.golang.org/protobuf/proto \
+ github.com/Lofanmi/pinyin-golang/pinyin github.com/youpy/go-wav
github.com/mdlayher/netlink
+
+ sed -i
's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#'
accounts/user.go
+
+ # https://github.com/linuxdeepin/developer-center/discussions/3327
+ sed -i 's#/usr/libexec#/usr/lib#' keybinding/shortcuts/system_shortcut.go
+ sed -i 's#${PREFIX}/libexec/#${PREFIX}/lib/#' Makefile
+
+ sed -i 's|"gopkg.in/yaml.v2"|"gopkg.in/yaml.v3"|'
network/nm_generator/utils.go
+
+ sed -i 's|/etc/os-version|/etc/uos-version|'
keybinding/shortcuts/shortcut_manager.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 2022-12-26 20:57:19 UTC (rev
1368521)
+++ deepin-daemon-fix-vanilla-libinput.patch 2022-12-26 20:57:34 UTC (rev
1368522)
@@ -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 1368521, deepin-daemon/trunk/deepin-daemon-fix-vanilla-libinput.patch)
===================================================================
--- deepin-daemon-fix-vanilla-libinput.patch (rev 0)
+++ deepin-daemon-fix-vanilla-libinput.patch 2022-12-26 20:57:34 UTC (rev
1368522)
@@ -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 2022-12-26 20:57:19 UTC (rev 1368521)
+++ deepin-daemon.install 2022-12-26 20:57:34 UTC (rev 1368522)
@@ -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
1368521, deepin-daemon/trunk/deepin-daemon.install)
===================================================================
--- deepin-daemon.install (rev 0)
+++ deepin-daemon.install 2022-12-26 20:57:34 UTC (rev 1368522)
@@ -0,0 +1,3 @@
+post_remove() {
+ rm -f /var/cache/deepin/mark-setup-network-services
+}
Deleted: deepin-daemon.sysusers
===================================================================
--- deepin-daemon.sysusers 2022-12-26 20:57:19 UTC (rev 1368521)
+++ deepin-daemon.sysusers 2022-12-26 20:57:34 UTC (rev 1368522)
@@ -1,2 +0,0 @@
-u deepin-daemon - "Deepin Daemon"
-g deepin-daemon -
Copied: deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers (from rev
1368521, deepin-daemon/trunk/deepin-daemon.sysusers)
===================================================================
--- deepin-daemon.sysusers (rev 0)
+++ deepin-daemon.sysusers 2022-12-26 20:57:34 UTC (rev 1368522)
@@ -0,0 +1,2 @@
+u deepin-daemon - "Deepin Daemon"
+g deepin-daemon -
Deleted: godbus.patch
===================================================================
--- godbus.patch 2022-12-26 20:57:19 UTC (rev 1368521)
+++ godbus.patch 2022-12-26 20:57:34 UTC (rev 1368522)
@@ -1,12 +0,0 @@
-diff --git a/decoder.go b/decoder.go
-index 3154447..a32eaf0 100644
---- a/decoder.go
-+++ b/decoder.go
-@@ -100,6 +100,7 @@ func (dec *decoder) read2buf(n int) error {
- // decodeU decodes uint32 obtained from the reader dec.in.
- // The goal is to reduce memory allocs.
- func (dec *decoder) decodeU() uint32 {
-+ dec.align(4)
- dec.binread(&dec.u)
- dec.pos += 4
- return dec.u
