Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-start for openSUSE:Factory
checked in at 2022-10-28 19:30:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-start (Old)
and /work/SRC/openSUSE:Factory/.deepin-start.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-start"
Fri Oct 28 19:30:03 2022 rev:9 rq:1031554 version:5.9.49
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-start/deepin-start.changes
2022-09-01 22:11:31.560302391 +0200
+++ /work/SRC/openSUSE:Factory/.deepin-start.new.2275/deepin-start.changes
2022-10-28 19:30:30.482925513 +0200
@@ -1,0 +2,6 @@
+Thu Oct 27 12:21:16 UTC 2022 - Hillwood Yang <hillw...@opensuse.org>
+
+- Add workaround-dde-kwin-crash.patch for Tumbleweed, Workaround the
+ dde-kwin crash issue
+
+-------------------------------------------------------------------
New:
----
workaround-dde-kwin-crash.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-start.spec ++++++
--- /var/tmp/diff_new_pack.HGmkoM/_old 2022-10-28 19:30:31.654931391 +0200
+++ /var/tmp/diff_new_pack.HGmkoM/_new 2022-10-28 19:30:31.662931431 +0200
@@ -32,6 +32,10 @@
# PATCH-FIX-OPENSUSE deepin-start-disable-gobuild-in-makefile.patch
hillw...@opensuse.org
# Use gobuild macro instead of makefile to build go binaries
Patch0: deepin-start-disable-gobuild-in-makefile.patch
+%if 0%{?suse_version} > 1500
+# PATCH-FIX-OPENSUSE workaround-dde-kwin-crash.patch hillw...@opensuse.org -
Workaround the dde-kwin crash issue
+Patch1: workaround-dde-kwin-crash.patch
+%endif
BuildRequires: fdupes
BuildRequires: golang-github-linuxdeepin-dde-api
BuildRequires: golang-github-linuxdeepin-go-dbus-factory
++++++ workaround-dde-kwin-crash.patch ++++++
diff -Nur startdde-5.9.49/main.go startdde-5.9.49-new/main.go
--- startdde-5.9.49/main.go 2022-08-17 12:21:36.000000000 +0800
+++ startdde-5.9.49-new/main.go 2022-10-27 21:30:23.915940930 +0800
@@ -91,12 +91,12 @@
}
func shouldUseDDEKWin() bool {
- _, err := os.Stat("/usr/bin/kwin_no_scale")
+ _, err := os.Stat("/usr/bin/kwin_x11")
return err == nil
}
const (
- cmdKWin = "/usr/bin/kwin_no_scale"
+ cmdKWin = "/usr/bin/kwin_x11"
cmdDdeSessionDaemon = "/usr/lib/deepin-daemon/dde-session-daemon"
cmdDdeDock = "/usr/bin/dde-dock"
cmdDdeDesktop = "/usr/bin/dde-desktop"
diff -Nur startdde-5.9.49/main_test.go startdde-5.9.49-new/main_test.go
--- startdde-5.9.49/main_test.go 2022-08-17 12:21:36.000000000 +0800
+++ startdde-5.9.49-new/main_test.go 2022-10-27 21:30:23.915940930 +0800
@@ -28,7 +28,7 @@
func Test_ShouldUseDDEKWin(t *testing.T) {
t.Run("Test is should use DDE KWin", func(t *testing.T) {
should := shouldUseDDEKWin()
- exist := Exist("/usr/bin/kwin_no_scale")
+ exist := Exist("/usr/bin/kwin_x11")
assert.Equal(t, exist, should)
})
}
diff -Nur startdde-5.9.49/watchdog/dde_kwin.go
startdde-5.9.49-new/watchdog/dde_kwin.go
--- startdde-5.9.49/watchdog/dde_kwin.go 2022-08-17 12:21:36.000000000
+0800
+++ startdde-5.9.49-new/watchdog/dde_kwin.go 2022-10-27 21:30:23.915940930
+0800
@@ -6,7 +6,7 @@
const (
kWinServiceName = "org.kde.KWin"
- ddeKWinCommand = "kwin_no_scale"
+ ddeKWinCommand = "kwin_x11"
)
func isDdeKWinRunning() (bool, error) {
diff -Nur startdde-5.9.49/watchdog/watchdog_test.go
startdde-5.9.49-new/watchdog/watchdog_test.go
--- startdde-5.9.49/watchdog/watchdog_test.go 2022-08-17 12:21:36.000000000
+0800
+++ startdde-5.9.49-new/watchdog/watchdog_test.go 2022-10-27
21:30:23.915940930 +0800
@@ -28,7 +28,7 @@
)
func isUseKwin() bool {
- _, err := os.Stat("/usr/bin/kwin_no_scale")
+ _, err := os.Stat("/usr/bin/kwin_x11")
return err == nil
}
