update

5 files changed, 197 insertions, 126 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1bb79a16d41..70fa26eb4d87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-daemon-git
 	pkgdesc = Daemon handling the DDE session settings
-	pkgver = 5.15.2.r9.g9406544e
+	pkgver = 6.0.32.r0.g44e230bc
 	pkgrel = 1
 	url = https://github.com/linuxdeepin/dde-daemon
 	install = deepin-daemon-git.install
@@ -8,40 +8,64 @@ pkgbase = deepin-daemon-git
 	arch = aarch64
 	groups = deepin-git
 	license = GPL3
-	makedepends = golang-github-linuxdeepin-go-dbus-factory-git
-	makedepends = golang-deepin-gir-git
-	makedepends = golang-deepin-lib-git
-	makedepends = deepin-api-git
-	makedepends = golang-github-nfnt-resize
-	makedepends = golang-gopkg-yaml.v3
 	makedepends = sqlite
-	makedepends = deepin-gettext-tools-git
+	makedepends = deepin-gettext-tools
 	makedepends = git
 	makedepends = mercurial
 	makedepends = python-gobject
 	makedepends = networkmanager
 	makedepends = bluez
 	makedepends = go
-	depends = deepin-desktop-schemas-git
-	depends = ddcutil
-	depends = deepin-api-git
-	depends = gvfs
+	depends = deepin-desktop-schemas
+	depends = deepin-api
+	depends = deepin-app-services
+	depends = deepin-wloutput-daemon
+	depends = gtk3
+	depends = libx11
+	depends = gdk-pixbuf-xlib
+	depends = gdk-pixbuf2
+	depends = libxi
+	depends = libpulse
+	depends = glib2
+	depends = libxcursor
+	depends = libxcrypt
+	depends = libgudev
+	depends = pam
 	depends = iso-codes
-	depends = lsb-release
-	depends = deepin-app-services-git
-	depends = mobile-broadband-provider-info
-	depends = deepin-polkit-agent-git
-	depends = deepin-polkit-agent-ext-gnomekeyring-git
-	depends = udisks2
-	depends = upower
-	depends = libxkbfile
 	depends = accountsservice
-	depends = deepin-desktop-base-git
-	depends = bamf
-	depends = pulseaudio
-	depends = org.freedesktop.secrets
+	depends = deepin-polkit-agent
+	depends = deepin-polkit-agent-ext-gnomekeyring
+	depends = deepin-desktop-base
+	depends = fontconfig
 	depends = noto-fonts
+	depends = pulse-native-provider
+	depends = alsa-lib
+	depends = ddcutil
+	depends = libxfixes
+	depends = bamf
+	depends = deepin-widgets
+	depends = deepin-session-ui
+	depends = sudo
 	depends = imwheel
+	depends = libxkbfile
+	depends = procps-ng
+	depends = psmisc
+	depends = libnl
+	depends = gvfs
+	depends = deepin-application-manager
+	depends = librsvg
+	depends = mobile-broadband-provider-info
+	depends = org.freedesktop.secrets
+	depends = xdg-utils
+	depends = systemd
+	depends = systemd-libs
+	depends = dmidecode
+	depends = libinput
+	depends = lshw
+	depends = upower
+	depends = lsb-release
+	depends = udisks2
+	depends = util-linux
 	optdepends = networkmanager: for network management support
 	optdepends = bluez: for bluetooth support
 	optdepends = iw: for miracast module
@@ -49,10 +73,12 @@ pkgbase = deepin-daemon-git
 	provides = deepin-daemon
 	conflicts = deepin-daemon
 	source = deepin-daemon-git::git+https://github.com/linuxdeepin/dde-daemon
-	source = dde-daemon.patch
+	source = deepin-daemon-fix-vanilla-libinput.patch
+	source = ddcutil-2.patch
 	source = deepin-daemon.sysusers
 	sha512sums = SKIP
-	sha512sums = SKIP
+	sha512sums = 08986beb83c6340578060e39916501816280b85478a97892f2cd545150702be2670c3d0f30edb4ecb7af8fb020132ad4926b6d2950a087d6d39982cd8988d0f2
+	sha512sums = 01412b8d70e5f1c4bf86acaa9e1ddeb955f7f34d168515ced08d030a8316fb76ab26a0ff09a8cffb199e0edbb54a3de7bb2e89fcdb2b412ad61b2bad9a0bb475
 	sha512sums = 808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a
 
 pkgname = deepin-daemon-git
diff --git a/PKGBUILD b/PKGBUILD
index d1ce3bd8adc8..bcbe2a53c062 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,84 +1,104 @@
 # Maintainer: justforlxz <justforlxz@gmail.com>
 
 pkgname=deepin-daemon-git
-pkgver=5.15.2.r9.g9406544e
+_pkgname=deepin-daemon
+pkgver=6.0.32.r0.g44e230bc
 pkgrel=1
 pkgdesc='Daemon handling the DDE session settings'
 arch=('x86_64' 'aarch64')
 url="https://github.com/linuxdeepin/dde-daemon"
 license=('GPL3')
-depends=('deepin-desktop-schemas-git' 'ddcutil' 'deepin-api-git' 'gvfs' 'iso-codes' 'lsb-release'
-         'deepin-app-services-git'
-         'mobile-broadband-provider-info' 'deepin-polkit-agent-git'
-         'deepin-polkit-agent-ext-gnomekeyring-git' 'udisks2' 'upower'
-         'libxkbfile' 'accountsservice' 'deepin-desktop-base-git' 'bamf' 'pulseaudio'
-         'org.freedesktop.secrets' 'noto-fonts' 'imwheel')
-makedepends=('golang-github-linuxdeepin-go-dbus-factory-git' 'golang-deepin-gir-git' 'golang-deepin-lib-git'
-             'deepin-api-git' 'golang-github-nfnt-resize' 'golang-gopkg-yaml.v3' 'sqlite' 'deepin-gettext-tools-git'
-             'git' 'mercurial' 'python-gobject' 'networkmanager' 'bluez' 'go')
+# deepin-session-shell not added for org.deepin.dde.LockFront1, because bring in
+#                      deepin-session for non-DDE users is not desirable
+depends=('deepin-desktop-schemas' 'deepin-api' 'deepin-app-services' 'deepin-wloutput-daemon'
+         # TODO
+         'gtk3' 'libx11' 'gdk-pixbuf-xlib' 'gdk-pixbuf2' 'libxi' 'libpulse' 'glib2' 'libxcursor'
+         'libxcrypt' 'libgudev' 'pam' '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
+         'pulse-native-provider' 'alsa-lib'
+         # bin/backlight_helper
+         'ddcutil'
+         # clipboard
+         'libxfixes'
+         # dock
+         'bamf'
+         # gesture
+         'deepin-widgets'
+         # image_effect
+         'deepin-session-ui' 'sudo'
+         # inputdevices
+         'imwheel' 'libxkbfile' 'procps-ng' 'psmisc'
+         # iw
+         'libnl'
+         # keybinding
+         'gvfs'
+         # keybinding/default-terminal
+         'deepin-application-manager'
+         # misc
+         'librsvg'
+         # network
+         'mobile-broadband-provider-info' 'org.freedesktop.secrets' 'xdg-utils'
+         # network/system
+         'systemd' 'systemd-libs'
+         # system
+         'dmidecode' 'libinput' 'lshw' 'upower'
+         # systeminfo
+         'lsb-release' 'udisks2' 'util-linux')
+makedepends=('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=('deepin-daemon')
-provides=('deepin-daemon')
+conflicts=($_pkgname)
+provides=($_pkgname)
 groups=('deepin-git')
 install="$pkgname.install"
 source=("$pkgname::git+https://github.com/linuxdeepin/dde-daemon"
-        dde-daemon.patch
+        deepin-daemon-fix-vanilla-libinput.patch
+        ddcutil-2.patch
         'deepin-daemon.sysusers')
 sha512sums=('SKIP'
-            'SKIP'
+            '08986beb83c6340578060e39916501816280b85478a97892f2cd545150702be2670c3d0f30edb4ecb7af8fb020132ad4926b6d2950a087d6d39982cd8988d0f2'
+            '01412b8d70e5f1c4bf86acaa9e1ddeb955f7f34d168515ced08d030a8316fb76ab26a0ff09a8cffb199e0edbb54a3de7bb2e89fcdb2b412ad61b2bad9a0bb475'
             '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
 
 pkgver() {
-    cd $pkgname
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd $pkgname
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
   cd $pkgname
-  sed -i '/uadp/d' bin/dde-system-daemon/main.go
-  sed -i '/uadp/d' bin/dde-session-daemon/module.go
-  sed -i '/uadp/d' bin/dde-session-daemon/daemon.go
-  patch -p1 -i ../dde-daemon.patch
-  rm -rf system/uadp
-  rm -rf session/uadpagent
-
-  export GOPATH="$srcdir/build:/usr/share/gocode"
-  export GO111MODULE=off
-  # golang-deepin-lib's dependency, remove when go packaging resumes
-  go get -v github.com/cryptix/wav
+  patch -p1 -i ../$_pkgname-fix-vanilla-libinput.patch
+  # Fix build with ddcutils 2
+  patch -p1 -i ../ddcutil-2.patch
 
-  go get -v 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
-  go get -v github.com/godbus/dbus
-  go get -v github.com/godbus/dbus/introspect
-  go get -v github.com/godbus/dbus/prop
-  go get -v github.com/Lofanmi/pinyin-golang/pinyin
-  go get -v github.com/youpy/go-wav
-  go get -v google.golang.org/protobuf/proto
-  go get -v github.com/mdlayher/netlink
-  go get -v github.com/jouyouyun/hardware/dmi
-  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/#;s#${DESTDIR}/lib#${DESTDIR}${PREFIX}/lib#' Makefile
 
-  cd $srcdir/build/src/github.com/godbus/dbus
-  git reset 4b691ce883d536a867587e2fcfec1245ebddecd0
-  git checkout -- .
+  sed -i 's|/etc/os-version|/etc/uos-version|' keybinding/shortcuts/shortcut_manager.go
 }
 
 build() {
+  cd $pkgname
+
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export CGO_LDFLAGS="${LDFLAGS}"
   export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-  export GOPATH="$srcdir/build:/usr/share/gocode"
-  export GO111MODULE=off
-
-  cd $pkgname
-#  make -C network/nm_generator gen-nm-code
+  
+  # make -C network/nm_generator gen-nm-code
   make
 }
 
@@ -86,9 +106,6 @@ package() {
   cd $pkgname
   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"
 }
+
diff --git a/ddcutil-2.patch b/ddcutil-2.patch
new file mode 100644
index 000000000000..76729d488b3c
--- /dev/null
+++ b/ddcutil-2.patch
@@ -0,0 +1,17 @@
+diff --git a/bin/backlight_helper/ddcci/ddcci.go b/bin/backlight_helper/ddcci/ddcci.go
+index 679beea3..ccbfc508 100644
+--- a/bin/backlight_helper/ddcci/ddcci.go
++++ b/bin/backlight_helper/ddcci/ddcci.go
+@@ -103,11 +103,6 @@ func newDDCCI() (*ddcci, error) {
+ 		displayHandleMap: make(map[string]*displayHandle),
+ 	}
+ 
+-	status := C.ddca_set_max_tries(C.DDCA_MULTI_PART_TRIES, 5)
+-	if status < C.int(0) {
+-		return nil, fmt.Errorf("brightness: Error setting retries: %d", status)
+-	}
+-
+ 	err := ddc.RefreshDisplays()
+ 	if err != nil {
+ 		return nil, err
+
diff --git a/dde-daemon.patch b/dde-daemon.patch
deleted file mode 100644
index fdb9c7d0932b..000000000000
--- a/dde-daemon.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/system/gesture/core.c b/system/gesture/core.c
-index 85902af6..e1f0df64 100644
---- a/system/gesture/core.c
-+++ b/system/gesture/core.c
-@@ -355,12 +355,12 @@ handle_gesture_events(struct libinput_event *ev, int type)
-         return ;
-     }
-     struct libinput_event_gesture *gesture = libinput_event_get_gesture_event(ev);
--    if (raw->dblclick
-+    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_TAP_END*/) {
-         raw->fingers = libinput_event_gesture_get_finger_count(gesture);
-         handleSwipeStop(raw->fingers);
-         raw->dblclick = false;
-@@ -438,7 +438,7 @@ handle_gesture_events(struct libinput_event *ev, int type)
- 
-         raw_event_reset(raw, true);
-         break;
--    case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
-+    /*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
-@@ -462,7 +462,7 @@ handle_gesture_events(struct libinput_event *ev, int type)
-         } else {
-             raw_event_reset(raw, true);
-         }
--        break;
-+        break;*/
-     }
- }
- 
-@@ -592,9 +592,9 @@ handle_events(struct libinput *li, struct movement *m)
-         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;
-         }
diff --git a/deepin-daemon-fix-vanilla-libinput.patch b/deepin-daemon-fix-vanilla-libinput.patch
new file mode 100644
index 000000000000..1778e966bb50
--- /dev/null
+++ b/deepin-daemon-fix-vanilla-libinput.patch
@@ -0,0 +1,60 @@
+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;
+         }
+