diff --git a/.gitignore b/.gitignore index c109459..2de38e8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /startdde-3.6.0.tar.gz /startdde-3.11.0.tar.gz /startdde-3.12.1.tar.gz +/startdde-5.0.1.tar.gz diff --git a/0001-Explicitly-start-osd-if-org.freedesktop.Notification.patch b/0001-Explicitly-start-osd-if-org.freedesktop.Notification.patch deleted file mode 100644 index 4ef3c43..0000000 --- a/0001-Explicitly-start-osd-if-org.freedesktop.Notification.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 7fe8b63d2c576f57589cd9bfbaf6831baeb28286 Mon Sep 17 00:00:00 2001 -From: Robin Lee -Date: Mon, 20 May 2019 14:57:26 +0800 -Subject: [PATCH] Explicitly start osd if org.freedesktop.Notifications is not - owned - ---- - session.go | 18 +++++++++++++++--- - utils.go | 15 +++++++++++++++ - 2 files changed, 30 insertions(+), 3 deletions(-) - -diff --git a/session.go b/session.go -index 2b610df..ca85df6 100644 ---- a/session.go -+++ b/session.go -@@ -355,9 +355,21 @@ func (m *SessionManager) launchDDE() { - osdRunning, err := isOSDRunning() - if err != nil { - logger.Warning(err) -- } else if osdRunning && globalXSManager.NeedRestartOSD() { -- // restart osd -- m.launch("/usr/lib/deepin-daemon/dde-osd", false) -+ } else { -+ if osdRunning { -+ if globalXSManager.NeedRestartOSD() { -+ logger.Info("Restart dde-osd") -+ m.launch("/usr/lib/deepin-daemon/dde-osd", false) -+ } -+ } else { -+ notificationsOwned, err := isNotificationsOwned() -+ if err != nil { -+ logger.Warning("failed to get org.freedesktop.Notifications status:", err) -+ } else if !notificationsOwned { -+ logger.Info("Explicitly start dde-osd") -+ m.launch("/usr/lib/deepin-daemon/dde-osd", false) -+ } -+ } - } - - groups, err := loadGroupFile() -diff --git a/utils.go b/utils.go -index cc10c25..25c5f35 100644 ---- a/utils.go -+++ b/utils.go -@@ -256,3 +256,18 @@ func isOSDRunning() (bool, error) { - } - return has, nil - } -+ -+func isNotificationsOwned() (bool, error) { -+ sessionBus, err := dbus.SessionBus() -+ if err != nil { -+ return false, err -+ } -+ -+ var has bool -+ err = sessionBus.BusObject().Call("org.freedesktop.DBus.NameHasOwner", 0, -+ "org.freedesktop.Notifications").Store(&has) -+ if err != nil { -+ return false, err -+ } -+ return has, nil -+} --- -2.21.0 - diff --git a/sources b/sources index ea1287f..ce61f7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (startdde-3.12.1.tar.gz) = 724d6b8769a46bc3995a9a359e2140dafbc95cbff6603bfcee980a6d6434fd6156b28b12eb850ce7e9601efda3541e25b619486f65a7b8f7828f2a837163f9eb +SHA512 (startdde-5.0.1.tar.gz) = accd1ba00136e2527303c3d093a5e63b57ed2bc22df19b4a4aa3d795279f50161abc1c05cf7cbb621cb06ec95ae0468b903ebcf4c6626f50bc0265f1aa2f2942 diff --git a/startdde.spec b/startdde.spec index 3a4c14e..dcfd818 100644 --- a/startdde.spec +++ b/startdde.spec @@ -1,17 +1,14 @@ Name: startdde -Version: 3.12.1 -Release: 4%{?dist} +Version: 5.0.1 +Release: 1%{?dist} Summary: Starter of deepin desktop environment License: GPLv3 URL: https://github.com/linuxdeepin/startdde Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# https://bugzilla.redhat.com/show_bug.cgi?id=1711001 -Patch0: 0001-Explicitly-start-osd-if-org.freedesktop.Notification.patch ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} BuildRequires: golang jq BuildRequires: deepin-gir-generator -BuildRequires: golang-deepin-dbus-factory-devel >= 3.1.16 BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) >= 3.1.26 BuildRequires: golang(pkg.deepin.io/lib) >= 1.2.11 BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.bluez) @@ -32,8 +29,7 @@ BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(systemd) %{?systemd_requires} Requires: deepin-daemon -Requires: deepin-wm -Requires: deepin-metacity +Requires: deepin-kwin Requires: libcgroup-tools %description @@ -42,7 +38,6 @@ custom applications which compliant with xdg autostart specification. %prep %setup -q -%patch0 -p1 sed -i '/polkit/s|lib|libexec|' watchdog/dde_polkit_agent.go sed -i '/deepin-daemon/s|lib|libexec|' utils.go session.go misc/auto_launch/*.json @@ -79,6 +74,9 @@ BUILD_ID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" %{_datadir}/%{name}/memchecker.json %changelog +* Mon Aug 05 2019 Robin Lee - 5.0.1-1 +- Release 5.0.1 + * Sat Jul 27 2019 Fedora Release Engineering - 3.12.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild