diff --git a/0001-Fix-the-system-monitor-displaying-a-scene.patch b/0001-Fix-the-system-monitor-displaying-a-scene.patch new file mode 100644 index 0000000000000000000000000000000000000000..2a437991a08f389b7fbc7c78d320b5f49813897d --- /dev/null +++ b/0001-Fix-the-system-monitor-displaying-a-scene.patch @@ -0,0 +1,317 @@ +From 01c17723fa4f91c40ac946e9d02bd55be85c1f75 Mon Sep 17 00:00:00 2001 +From: yangxianzhao +Date: Thu, 6 Apr 2023 10:06:18 +0800 +Subject: [PATCH] Fix-the-system-monitor-displaying-a-scene + +--- + dock/dock_manager_entries.go | 3 +- + dock/dock_manager_xevent.go | 13 ++++--- + dock/identify_window.go | 70 ++++++++++++++++++++++++------------ + 3 files changed, 58 insertions(+), 28 deletions(-) + +diff --git a/dock/dock_manager_entries.go b/dock/dock_manager_entries.go +index ad758c8..bf4c1d5 100644 +--- a/dock/dock_manager_entries.go ++++ b/dock/dock_manager_entries.go +@@ -83,6 +83,7 @@ func (m *Manager) attachOrDetachWindow(winInfo *WindowInfo) { + } else { + + if winInfo.entryInnerId == "" { ++ logger.Debugf("winInfo.entryInnerId is empty, call identifyWindow, win: %d", winInfo.window) + winInfo.entryInnerId, winInfo.appInfo = m.identifyWindow(winInfo) + m.markAppLaunched(winInfo.appInfo) + } else { +@@ -173,7 +174,7 @@ func (m *Manager) attachWindow(winInfo *WindowInfo) { + func (m *Manager) detachWindow(winInfo *WindowInfo) { + entry := m.Entries.getByWindowId(winInfo.window) + if entry == nil { +- logger.Warningf("entry of window '%x' is nil", winInfo.window) ++ logger.Warningf("entry of window %d is nil", winInfo.window) + return + } + needRemove := entry.detachWindow(winInfo) +diff --git a/dock/dock_manager_xevent.go b/dock/dock_manager_xevent.go +index 17468bf..c67a776 100644 +--- a/dock/dock_manager_xevent.go ++++ b/dock/dock_manager_xevent.go +@@ -21,6 +21,7 @@ package dock + + import ( + "sort" ++ "strings" + "time" + + x "github.com/linuxdeepin/go-x11-client" +@@ -76,12 +77,13 @@ func (m *Manager) handleClientListChanged() { + for _, win := range add { + window0 := win + addFunc := func() { +- logger.Debugf("client list add: %x", window0) ++ logger.Debugf("client list add: %d", window0) + winInfo := m.registerWindow(window0) + logger.Infof("%v", m.windowInfoMap) + repeatCount := 0 + for { + if repeatCount > 10 { ++ logger.Debugf("give up identify window %d", window0) + return + } + good := isGoodWindow(window0) +@@ -90,7 +92,9 @@ func (m *Manager) handleClientListChanged() { + } + pid := getWmPid(window0) + wmClass, _ := getWmClass(window0) +- if pid != 0 || wmClass != nil { ++ wmName := getWmName(window0) ++ wmCmd, _ := getWmCommand(window0) ++ if pid != 0 || wmClass != nil || wmName != "" || strings.Join(wmCmd, "") != "" { + m.attachOrDetachWindow(winInfo) + return + } +@@ -106,7 +110,7 @@ func (m *Manager) handleClientListChanged() { + for _, win := range remove { + window0 := win + removeFunc := func() { +- logger.Debugf("client list remove: %x", window0) ++ logger.Debugf("client list remove: %d", window0) + m.windowInfoMapMutex.RLock() + logger.Infof("%v", m.windowInfoMap) + winInfo := m.windowInfoMap[window0] +@@ -115,7 +119,7 @@ func (m *Manager) handleClientListChanged() { + m.detachWindow(winInfo) + winInfo.entryInnerId = "" + } else { +- logger.Warningf("window info of '%x' is nil", window0) ++ logger.Warningf("window info of %d is nil", window0) + entry := m.Entries.getByWindowId(window0) + m.removeAppEntry(entry) + } +@@ -198,6 +202,7 @@ func (m *Manager) handleMapNotifyEvent(ev *x.MapNotifyEvent) { + logger.Debug("MapNotifyEvent window:", ev.Window) + winInfo := m.registerWindow(ev.Window) + time.AfterFunc(2*time.Second, func() { ++ logger.Warningf("mapNotifyEvent after 2s, call identifyWindow, win: %d", winInfo.window) + _, appInfo := m.identifyWindow(winInfo) + m.markAppLaunched(appInfo) + }) +diff --git a/dock/identify_window.go b/dock/identify_window.go +index 9b433ed..e4f178e 100644 +--- a/dock/identify_window.go ++++ b/dock/identify_window.go +@@ -20,9 +20,11 @@ + package dock + + import ( ++ "fmt" + "path/filepath" + "strconv" + "strings" ++ "time" + + "pkg.deepin.io/lib/procfs" + ) +@@ -59,18 +61,18 @@ func (m *Manager) identifyWindow(winInfo *WindowInfo) (innerId string, appInfo * + logger.Debugf("identifyWindow: window id: %v, window innerId: %q", + winInfo.window, winInfo.innerId) + if winInfo.innerId == "" { +- logger.Debug("identifyWindow: winInfo.innerId is empty") ++ logger.Debugf("identifyWindow: win %d winInfo.innerId is empty", winInfo.window) + return + } + + for idx, item := range m.identifyWindowFuns { + name := item.Name +- logger.Debugf("identifyWindow: try %s:%d", name, idx) ++ logger.Debugf("identifyWindow %d try %s:%d", winInfo.window, name, idx) + innerId, appInfo = item.Fn(m, winInfo) + if innerId != "" { + // success +- logger.Debugf("identifyWindow by %s success, innerId: %q, appInfo: %v", +- name, innerId, appInfo) ++ logger.Debugf("identifyWindow %d by %s success, innerId: %q, appInfo: %v", ++ winInfo.window, name, innerId, appInfo) + // NOTE: if name == "Pid", appInfo may be nil + if appInfo != nil { + fixedAppInfo := fixAutostartAppInfo(appInfo) +@@ -101,8 +103,9 @@ func fixAutostartAppInfo(appInfo *AppInfo) *AppInfo { + } + + func identifyWindowByScratch(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { ++ msgPrefix := fmt.Sprintf("identifyWindowByScratch win: %d ", winInfo.window) + desktopFile := filepath.Join(scratchDir, addDesktopExt(winInfo.innerId)) +- logger.Debugf("try scratch desktop file: %q", desktopFile) ++ logger.Debugf("%s try scratch desktop file: %q", msgPrefix, desktopFile) + appInfo := NewAppInfoFromFile(desktopFile) + if appInfo != nil { + // success +@@ -113,8 +116,9 @@ func identifyWindowByScratch(m *Manager, winInfo *WindowInfo) (string, *AppInfo) + } + + func identifyWindowByPid(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { ++ msgPrefix := fmt.Sprintf("identifyWindowByPid win: %d ", winInfo.window) + if winInfo.pid > 10 { +- logger.Debugf("identifyWindowByPid: pid: %d", winInfo.pid) ++ logger.Debugf("%s pid: %d", msgPrefix, winInfo.pid) + entry := m.Entries.GetByWindowPid(winInfo.pid) + if entry != nil { + // success +@@ -126,8 +130,9 @@ func identifyWindowByPid(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { + } + + func identifyWindowByGtkAppId(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { ++ msgPrefix := fmt.Sprintf("identifyWindowByGtkAppId win: %d ", winInfo.window) + gtkAppId := winInfo.gtkAppId +- logger.Debugf("identifyWindowByGtkAppId: gtkAppId: %q", gtkAppId) ++ logger.Debugf("%s gtkAppId: %q", msgPrefix, gtkAppId) + if gtkAppId != "" { + appInfo := NewAppInfo(gtkAppId) + if appInfo != nil { +@@ -140,8 +145,9 @@ func identifyWindowByGtkAppId(m *Manager, winInfo *WindowInfo) (string, *AppInfo + } + + func identifyWindowByFlatpakAppID(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { ++ msgPrefix := fmt.Sprintf("identifyWindowByFlatpakAppID win: %d ", winInfo.window) + flatpakRef := winInfo.flatpakAppID +- logger.Debugf("identifyWindowByFlatpakAppID: flatpak ref is %q", flatpakRef) ++ logger.Debugf("%s flatpak ref is %q", msgPrefix, flatpakRef) + if strings.HasPrefix(flatpakRef, "app/") { + parts := strings.Split(flatpakRef, "/") + if len(parts) > 1 { +@@ -204,12 +210,13 @@ var crxAppIdMap = map[string]string{ + } + + func identifyWindowByCrxId(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { ++ msgPrefix := fmt.Sprintf("identifyWindowByCrxId win: %d ", winInfo.window) + if winInfo.wmClass != nil && + strings.EqualFold(winInfo.wmClass.Class, "chromium-browser") && + strings.HasPrefix(winInfo.wmClass.Instance, "crx_") { + + appId, ok := crxAppIdMap[winInfo.wmClass.Instance] +- logger.Debug("identifyWindowByCrxId", appId) ++ logger.Debug(msgPrefix, "appId:", appId) + if ok { + appInfo := NewAppInfo(appId) + if appInfo != nil { +@@ -223,6 +230,7 @@ func identifyWindowByCrxId(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { + } + + func identifyWindowByCmdlineTurboBooster(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { ++ msgPrefix := fmt.Sprintf("identifyWindowByCmdlineTurboBooster win: %d ", winInfo.window) + pid := winInfo.pid + process := winInfo.process + if process != nil && pid != 0 { +@@ -233,7 +241,7 @@ func identifyWindowByCmdlineTurboBooster(m *Manager, winInfo *WindowInfo) (strin + } else if strings.Contains(process.cmdline[0], "/applications/") { + matches, err := filepath.Glob(process.cmdline[0] + "*") + if err != nil { +- logger.Warning("filepath.Glob err:", err) ++ logger.Warning(msgPrefix, "filepath.Glob err:", err) + return "", nil + } + if len(matches) > 0 && strings.HasSuffix(matches[0], desktopExt) { +@@ -242,7 +250,7 @@ func identifyWindowByCmdlineTurboBooster(m *Manager, winInfo *WindowInfo) (strin + } + + if desktopFile != "" { +- logger.Debugf("identifyWindowByCmdlineTurboBooster: desktopFile: %s", desktopFile) ++ logger.Debugf("%s desktopFile: %s", msgPrefix, desktopFile) + appInfo := NewAppInfoFromFile(desktopFile) + if appInfo != nil { + // success +@@ -257,6 +265,7 @@ func identifyWindowByCmdlineTurboBooster(m *Manager, winInfo *WindowInfo) (strin + } + + func identifyWindowByPidEnv(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { ++ msgPrefix := fmt.Sprintf("identifyWindowByPidEnv win: %d ", winInfo.window) + pid := winInfo.pid + process := winInfo.process + if process != nil && pid != 0 { +@@ -264,18 +273,22 @@ func identifyWindowByPidEnv(m *Manager, winInfo *WindowInfo) (string, *AppInfo) + launchedDesktopFilePid, _ := strconv.ParseUint( + process.environ.Get("GIO_LAUNCHED_DESKTOP_FILE_PID"), 10, 32) + +- logger.Debugf("identifyWindowByPidEnv: launchedDesktopFile: %q, pid: %d", +- launchedDesktopFile, launchedDesktopFilePid) ++ logger.Debugf("%s launchedDesktopFile: %q, pid: %d", ++ msgPrefix, launchedDesktopFile, launchedDesktopFilePid) + ++ // 以下 2 种情况下，才能信任环境变量 GIO_LAUNCHED_DESKTOP_FILE。 ++ // 1. 当窗口 pid 和 launchedDesktopFilePid 相同时； ++ // 2. 当窗口的进程的父进程 id（即 ppid）和 launchedDesktopFilePid 相同， ++ // 并且该父进程是 sh 或 bash 时。 + var try bool +- if uint(launchedDesktopFilePid) == pid || process.ppid == 1 { // launchedDesktopFilePid可能被销毁，process变成孤儿进程 ++ if uint(launchedDesktopFilePid) == pid { + try = true + } else if uint(launchedDesktopFilePid) == process.ppid && process.ppid != 0 { +- logger.Debug("ppid equal") ++ logger.Debug(msgPrefix, "ppid equal") + parentProcess := procfs.Process(process.ppid) + cmdline, err := parentProcess.Cmdline() + if err == nil && len(cmdline) > 0 { +- logger.Debugf("parent process cmdline: %#v", cmdline) ++ logger.Debugf("%s parent process cmdline: %#v", msgPrefix, cmdline) + base := filepath.Base(cmdline[0]) + if base == "sh" || base == "bash" { + try = true +@@ -296,11 +309,12 @@ func identifyWindowByPidEnv(m *Manager, winInfo *WindowInfo) (string, *AppInfo) + } + + func identifyWindowByRule(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { ++ msgPrefix := fmt.Sprintf("identifyWindowByRule win: %d ", winInfo.window) + ret := m.windowPatterns.Match(winInfo) + if ret == "" { + return "", nil + } +- logger.Debug("identifyWindowByRule ret:", ret) ++ logger.Debug(msgPrefix, "patterns match result:", ret) + // parse ret + // id=$appId or env + var appInfo *AppInfo +@@ -356,12 +370,21 @@ func identifyWindowByWmClass(m *Manager, winInfo *WindowInfo) (string, *AppInfo) + } + + func identifyWindowByBamf(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { +- // bamf ++ msgPrefix := fmt.Sprintf("identifyWindowByBamf win: %d ", winInfo.window) + win := winInfo.window +- desktop, err := getDesktopFromWindowByBamf(win) +- if err != nil { +- logger.Warning(err) +- return "", nil ++ desktop := "" ++ // 重试 bamf 识别，yozo office 的窗口经常要第二次时才能识别到。 ++ for i := 0; i < 3; i++ { ++ var err error ++ desktop, err = getDesktopFromWindowByBamf(win) ++ logger.Debugf("%s get desktop i: %d, desktop: %q", msgPrefix, i, desktop) ++ if err != nil { ++ logger.Warning(msgPrefix, "get desktop failed:", err) ++ } ++ if desktop != "" { ++ break ++ } ++ time.Sleep(100 * time.Millisecond) + } + + if desktop != "" { +@@ -375,6 +398,7 @@ func identifyWindowByBamf(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { + } + + func identifyWindowByCmdlineXWalk(m *Manager, winInfo *WindowInfo) (string, *AppInfo) { ++ msgPrefix := fmt.Sprintf("identifyWindowByCmdlineXWalk win: %d ", winInfo.window) + process := winInfo.process + if process == nil || winInfo.pid == 0 { + return "", nil +@@ -386,7 +410,7 @@ func identifyWindowByCmdlineXWalk(m *Manager, winInfo *WindowInfo) (string, *App + return "", nil + } + lastArg := args[len(args)-1] +- logger.Debugf("lastArg: %q", lastArg) ++ logger.Debugf("%s lastArg: %q", msgPrefix, lastArg) + + if filepath.Base(lastArg) == "manifest.json" { + appId := filepath.Base(filepath.Dir(lastArg)) +-- +2.18.4 + diff --git a/0001-fix-building-error.patch b/0001-fix-building-error.patch deleted file mode 100644 index 3104173632818e3a706e831f35b9cdceec8af92f..0000000000000000000000000000000000000000 --- a/0001-fix-building-error.patch +++ /dev/null @@ -1,67 +0,0 @@ -From eae5e193d50494616d983600ca014b801d75e32f Mon Sep 17 00:00:00 2001 -From: Your Name -Date: Thu, 7 May 2020 14:16:56 +0800 -Subject: [PATCH 2/2] 2 - ---- - misc/dde-daemon/gesture.json | 9 --------- - system/gesture/core.c | 5 +++++ - 2 files changed, 5 insertions(+), 9 deletions(-) - -diff --git a/misc/dde-daemon/gesture.json b/misc/dde-daemon/gesture.json -index 73a3d7e..fbcc8fd 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 f953cc1..ab1ffdf 100644 ---- a/system/gesture/core.c -+++ b/system/gesture/core.c -@@ -305,6 +305,7 @@ handle_gesture_events(struct libinput_event *ev, int type) - } - raw_event_reset(raw); - break; -+#if 0 - case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: - break; - case LIBINPUT_EVENT_GESTURE_TAP_END: -@@ -315,6 +316,7 @@ handle_gesture_events(struct libinput_event *ev, int type) - g_debug("[Tap] fingers: %d", raw->fingers); - handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers); - break; -+#endif - } - } - -@@ -432,10 +434,13 @@ handle_events(struct libinput *li) - case LIBINPUT_EVENT_GESTURE_PINCH_END: - case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN: - case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE: -+#if 0 - case LIBINPUT_EVENT_GESTURE_SWIPE_END: - case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: - case LIBINPUT_EVENT_GESTURE_TAP_UPDATE: - case LIBINPUT_EVENT_GESTURE_TAP_END:{ -+#endif -+ case LIBINPUT_EVENT_GESTURE_SWIPE_END:{ - handle_gesture_events(ev, type); - break; - } --- -2.18.2 - diff --git a/dde-daemon-5.13.85.8.tar.gz b/dde-daemon-5.13.85.8.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b815f33c70906cde43ceae102e2dc2736626ccdd Binary files /dev/null and b/dde-daemon-5.13.85.8.tar.gz differ diff --git a/dde-daemon.spec b/dde-daemon.spec index b5f986ba6af928192461e9435157e2fece4277cf..2e25a8d51490f92a63e00288cacbffd91855c9cd 100644 --- a/dde-daemon.spec +++ b/dde-daemon.spec @@ -1,6 +1,6 @@ %global _smp_mflags -j1 -%global debug_package %{nil} +##%global debug_package %{nil} %global _unpackaged_files_terminate_build 0 %global _missing_build_ids_terminate_build 0 %define __debug_install_post \ @@ -11,16 +11,18 @@ %global release_name server-industry Name: dde-daemon -Version: 5.10.0.23 -Release: 8 +Version: 5.13.85.8 +Release: 3 Summary: Daemon handling the DDE session settings License: GPLv3 URL: http://shuttle.corp.deepin.com/cache/tasks/18802/unstable-amd64/ -Source0: %{name}-%{version}-%{release_name}.orig.tar.xz -Patch0: 0001-fix-building-error.patch +Source0: %{name}-%{version}.tar.gz +Source1: vendor.tar.gz +Source2: %{sname}.sysusers +#Patch1: 0001-Fix-the-system-monitor-displaying-a-scene.patch BuildRequires: python3 -BuildRequires: compiler(go-compiler) +BuildRequires: golang BuildRequires: deepin-gettext-tools BuildRequires: fontpackages-devel BuildRequires: librsvg2-tools @@ -32,8 +34,7 @@ BuildRequires: systemd-devel BuildRequires: alsa-lib-devel BuildRequires: alsa-lib BuildRequires: pulseaudio-libs-devel -BuildRequires: gdk-pixbuf2-xlib-devel -BuildRequires: gdk-pixbuf2-xlib +BuildRequires: gdk-pixbuf-xlib BuildRequires: libnl3-devel BuildRequires: libnl3 BuildRequires: libgudev-devel @@ -43,6 +44,10 @@ BuildRequires: libinput BuildRequires: librsvg2-devel BuildRequires: librsvg2 BuildRequires: libXcursor-devel +BuildRequires: libddcutil-devel +BuildRequires: pkgconfig(sqlite3) +BuildRequires: dde-api-devel +BuildRequires: libX11-devel Requires: bluez-libs Requires: deepin-desktop-base @@ -52,6 +57,7 @@ Requires: dde-polkit-agent Requires: rfkill Requires: gvfs Requires: iw +Requires: fprintd Recommends: iso-codes Recommends: imwheel @@ -63,8 +69,9 @@ Recommends: google-noto-sans-fonts Daemon handling the DDE session settings %prep -%setup -q -n %{name}-%{version}-%{release_name} -%patch0 -p1 +%autosetup -p1 -n %{name}-%{version} +tar -xf %{SOURCE1} +patch langselector/locale.go < rpm/locale.go.patch # Fix library exec path sed -i '/deepin/s|lib|libexec|' Makefile @@ -108,13 +115,19 @@ EOF sed -i 's/google-chrome/chromium-browser/g' misc/dde-daemon/mime/data.json %build +go env -w GO111MODULE=auto +export GOPATH=%{_builddir}/%{name}-%{version}/vendor:$GOPATH + BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -export GOPATH=%{_builddir}/%{name}-%{version}-%{release_name}/vendor -%make_build GOBUILD="go build -mod=vendor -compiler gc -ldflags \"-B $BUILDID\"" +%make_build GO_BUILD_FLAGS=-trimpath GOBUILD="go build -compiler gc -ldflags \"-s -B $BUILDID\"" +#make GOPATH=/usr/share/gocode %install -export GOPATH=/usr/share/gocode:%{_builddir}/%{name}-%{version}-%{release_name}/vendor -%make_install +BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" +export GOPATH=%{_builddir}/%{name}-%{version}/vendor:$GOPATH +%make_install PAM_MODULE_DIR=%{_libdir}/security GOBUILD="go build -compiler gc -ldflags \"-B $BUILDID\"" + +install -Dm644 %{SOURCE2} %{buildroot}/usr/lib/sysusers.d/%{sname}.conf # fix systemd/logind config install -d %{buildroot}/usr/lib/systemd/logind.conf.d/ @@ -124,9 +137,6 @@ HandlePowerKey=ignore HandleSuspendKey=ignore EOF -install -d %{buildroot}/%{_libdir}/security/ -install -Dm755 %{buildroot}/pam_deepin_auth.so %{buildroot}/%{_libdir}/security/pam_deepin_auth.so - %find_lang %{name} %post @@ -135,6 +145,7 @@ if [ $1 -ge 1 ]; then %{_sbindir}/alternatives --install %{_bindir}/x-terminal-emulator \ x-terminal-emulator %{_libexecdir}/%{sname}/default-terminal 30 fi +systemctl enable deepin-accounts-daemon %preun if [ $1 -eq 0 ]; then @@ -163,20 +174,64 @@ fi %{_datadir}/%{name}/ %{_datadir}/dde/ %{_datadir}/polkit-1/actions/*.policy -%{_var}/cache/appearance/ %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla %{_sysconfdir}/acpi/actions/deepin_lid.sh %{_sysconfdir}/acpi/events/deepin_lid %{_sysconfdir}/pulse/daemon.conf.d/10-deepin.conf /lib/udev/rules.d/80-deepin-fprintd.rules -%{_datadir}/pam-configs/deepin-auth /var/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Fprintd.pkla -%{_libdir}/security/pam_deepin_auth.so /lib/systemd/system/dbus-com.deepin.dde.lockservice.service /lib/systemd/system/deepin-accounts-daemon.service +%{_sysusersdir}/%{sname}.conf +/etc/NetworkManager/conf.d/deepin.dde.daemon.conf +/etc/lightdm/deepin/xsettingsd.conf %changelog +* Wed May 31 2023 hanshuang - 5.13.85.8-3 +- fix: install start problem + +* Wed May 31 2023 Wenlong Zhang - 5.13.85.8-2 +- update sys to 0.4.0 to support loong64 + +* Mon Apr 10 2023 liweiganga - 5.13.85.8-1 +- update: update to 5.13.85.8 + +* Thu Apr 06 2023 yangxianzhao - 5.13.16.11-6 +- fix: Fix-the-system-monitor-displaying-a-scene + +* Thu Mar 16 2023 liweiganga - 5.13.16.11-5 +- feat: fix strip + +* Fri Mar 10 2023 hanshuang - 5.13.16.11-4 +- fix deepin-accounts-daemon.service log fail + +* Wed Dec 21 2022 liweiganga - 5.13.16.11-3 +- enable debuginfo for fix strip + +* Tue Aug 02 2022 liweiganga - 5.13.16.11-2 +- fix install + +* Mon Jul 18 2022 konglidong - 5.13.16.11-1 +- Update to 5.13.16.11 + +* Sat Jan 29 2022 liweigang - 5.12.0.18-4 +- fix build error and format spec. + +* Thu Aug 26 2021 heyitao - 5.12.0.18-3 +- Update vendor.tag.gz. + +* Tue Jul 20 2021 weidong - 5.12.0.18-2 +- Suggest use deepin-desktop-server to provide deepin-desktop-base. + +* Thu Jul 08 2021 weidong - 5.12.0.18-1 +- Update 5.12.0.18. + +* Thu Mar 04 2021 weidong - 5.10.0.23-10 +- Update license. + +* Thu Feb 18 2021 chenbo pan - 5.10.0.23-9 +- fix build error * Wed Sep 2 2020 chenbo pan - 5.10.0.23-8 - fix requires golang devel * Wed Aug 19 2020 openEuler Buildteam - 5.10.0.23-7 diff --git a/deepin-daemon.sysusers b/deepin-daemon.sysusers new file mode 100644 index 0000000000000000000000000000000000000000..a67608714d0b3454fff67c52be121401b53c9f0b --- /dev/null +++ b/deepin-daemon.sysusers @@ -0,0 +1,2 @@ +u deepin-daemon - "Deepin Daemon" +g deepin-daemon - diff --git a/dde-daemon-5.10.0.23-server-industry.orig.tar.xz b/vendor.tar.gz similarity index 52% rename from dde-daemon-5.10.0.23-server-industry.orig.tar.xz rename to vendor.tar.gz index eaa873b7f6ead5c177304a68225b07dc8a9b98a9..a2b0689df34dfa90536260dd7bb95f1aa2c39ca4 100644 Binary files a/dde-daemon-5.10.0.23-server-industry.orig.tar.xz and b/vendor.tar.gz differ